summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2021-07-18 10:10:05 +0800
committerBobby Rong <rjl931189261@126.com>2021-09-18 19:33:35 +0800
commit798cc01d0c0834c2a2c3b923ff07917edb5703da (patch)
tree497f58e85eeed7dec3b9882834795b8d64ce92b7
parentaeeed28b6e1b80a3b841d921c7c58c1f08b22a22 (diff)
downloadnixpkgs-798cc01d0c0834c2a2c3b923ff07917edb5703da.tar
nixpkgs-798cc01d0c0834c2a2c3b923ff07917edb5703da.tar.gz
nixpkgs-798cc01d0c0834c2a2c3b923ff07917edb5703da.tar.bz2
nixpkgs-798cc01d0c0834c2a2c3b923ff07917edb5703da.tar.lz
nixpkgs-798cc01d0c0834c2a2c3b923ff07917edb5703da.tar.xz
nixpkgs-798cc01d0c0834c2a2c3b923ff07917edb5703da.tar.zst
nixpkgs-798cc01d0c0834c2a2c3b923ff07917edb5703da.zip
pantheon.wingpanel-indicator-sound: 2.1.6 -> 6.0.0
-rw-r--r--pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix16
1 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
index 25707f39e46..00ae9bfc4b6 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix
@@ -1,5 +1,6 @@
 { lib, stdenv
 , fetchFromGitHub
+, fetchpatch
 , nix-update-script
 , pantheon
 , pkg-config
@@ -19,15 +20,24 @@
 
 stdenv.mkDerivation rec {
   pname = "wingpanel-indicator-sound";
-  version = "2.1.6";
+  version = "6.0.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-WGkxLsbdJ7Z7kolymYpggsVy4cN4CicNKdfCbunklSI=";
+    sha256 = "0cv97c0qrhqisyghy9a9qr4ffcx3g4bkswxm6rn4r2wfg4gvljri";
   };
 
+  patches = [
+    # Upstream code not respecting our localedir
+    # https://github.com/elementary/wingpanel-indicator-sound/pull/216
+    (fetchpatch {
+      url = "https://github.com/elementary/wingpanel-indicator-sound/commit/df816104c15e4322c1077313b1f43114cdaf710e.patch";
+      sha256 = "029z7l467jz1ymxwrzrf874062r6xmskl7mldpq39jh110fijy5l";
+    })
+  ];
+
   passthru = {
     updateScript = nix-update-script {
       attrPath = "pantheon.${pname}";
@@ -61,7 +71,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Sound Indicator for Wingpanel";
     homepage = "https://github.com/elementary/wingpanel-indicator-sound";
-    license = licenses.gpl2Plus;
+    license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = pantheon.maintainers;
   };