diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix')
-rw-r--r-- | nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index 55f27d606467..16e04bedcb93 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -1,13 +1,12 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script -, pantheon , pkg-config , meson , python3 , ninja -, vala_0_52 +, vala , gtk3 , granite , wingpanel @@ -20,28 +19,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-sound"; - version = "6.0.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - 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}"; - }; + sha256 = "sha256-FHZ4YhGLqGTz5Po2XFJvnWuAi1eHKcT9zzgJFHic02E="; }; nativeBuildInputs = [ @@ -50,9 +34,7 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - # Does not build with vala 0.54 - # https://github.com/elementary/wingpanel-indicator-sound/issues/219 - vala_0_52 + vala ]; buildInputs = [ @@ -70,6 +52,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "Sound Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-sound"; |