60 lines
2.3 KiB
Diff
60 lines
2.3 KiB
Diff
|
From 1a9e59acb740170445dc5d7f5c11d72c32d85e3f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Gabriel Ebner <gebner@gebner.org>
|
||
|
|
Date: Mon, 25 Apr 2022 14:13:17 +0200
|
||
|
|
Subject: [PATCH] clementine: 1.4.0rc1 -> unstable-2022-04-11
|
||
|
|
|
||
|
|
---
|
||
|
|
pkgs/applications/audio/clementine/default.nix | 13 +++----------
|
||
|
|
pkgs/top-level/all-packages.nix | 4 ++--
|
||
|
|
2 files changed, 5 insertions(+), 12 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
|
||
|
|
index 550100574db40..3c9e35c8726bb 100644
|
||
|
|
--- a/pkgs/applications/audio/clementine/default.nix
|
||
|
|
+++ b/pkgs/applications/audio/clementine/default.nix
|
||
|
|
@@ -51,24 +51,17 @@ let
|
||
|
|
withCD = config.clementine.cd or true;
|
||
|
|
withCloud = config.clementine.cloud or true;
|
||
|
|
|
||
|
|
- # On the update after all 1.4rc, qt5.15 and protobuf 3.15 will be supported.
|
||
|
|
- version = "1.4.0rc1";
|
||
|
|
+ version = "unstable-2022-04-11";
|
||
|
|
|
||
|
|
src = fetchFromGitHub {
|
||
|
|
owner = "clementine-player";
|
||
|
|
repo = "Clementine";
|
||
|
|
- rev = version;
|
||
|
|
- sha256 = "1rqk0hrsn8f8bjk0j0vq1af0ygy6xx7qi9fw0jjw2cmj6kzckyi2";
|
||
|
|
+ rev = "250024e117fbe5fae7c62b9c8e655d66412a6ed7";
|
||
|
|
+ sha256 = "06fcbs3wig3mh711iypyj49qm5246f7qhvgvv8brqfrd8cqyh6qf";
|
||
|
|
};
|
||
|
|
|
||
|
|
patches = [
|
||
|
|
./clementine-spotify-blob.patch
|
||
|
|
- (fetchpatch {
|
||
|
|
- # "short-term" fix for execution on wayland (1.4.0rc1-131-g2179027a6)
|
||
|
|
- # for https://github.com/clementine-player/Clementine/issues/6587
|
||
|
|
- url = "https://github.com/clementine-player/Clementine/commit/2179027a6d97530c857e43be873baacd696ff332.patch";
|
||
|
|
- sha256 = "0344bfcyvjim5ph8w4km6zkg96rj5g9ybp9x14qgyw2gkdksimn6";
|
||
|
|
- })
|
||
|
|
];
|
||
|
|
|
||
|
|
nativeBuildInputs = [
|
||
|
|
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
|
||
|
|
index 23880ad0816b5..94207b8b6627b 100644
|
||
|
|
--- a/pkgs/top-level/all-packages.nix
|
||
|
|
+++ b/pkgs/top-level/all-packages.nix
|
||
|
|
@@ -4536,10 +4536,10 @@ with pkgs;
|
||
|
|
|
||
|
|
cksfv = callPackage ../tools/networking/cksfv { };
|
||
|
|
|
||
|
|
- clementine = libsForQt514.callPackage ../applications/audio/clementine {
|
||
|
|
+ clementine = libsForQt5.callPackage ../applications/audio/clementine {
|
||
|
|
gst_plugins =
|
||
|
|
with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ];
|
||
|
|
- protobuf = protobuf3_14;
|
||
|
|
+ protobuf = protobuf3_19;
|
||
|
|
};
|
||
|
|
|
||
|
|
clementineUnfree = clementine.unfree;
|