diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/audio/pasystray/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/audio/pasystray/default.nix | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/tools/audio/pasystray/default.nix b/nixpkgs/pkgs/tools/audio/pasystray/default.nix index 2bedd2abacdd..c01088466599 100644 --- a/nixpkgs/pkgs/tools/audio/pasystray/default.nix +++ b/nixpkgs/pkgs/tools/audio/pasystray/default.nix @@ -1,34 +1,38 @@ { lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook, wrapGAppsHook -, gnome, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio -, xlibsWrapper, gsettings-desktop-schemas +, gnome, avahi, gtk3, libayatana-appindicator, libnotify, libpulseaudio +, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "pasystray"; - version = "0.7.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "christophgysin"; repo = "pasystray"; - rev = "${pname}-${version}"; - sha256 = "0xx1bm9kimgq11a359ikabdndqg5q54pn1d1dyyjnrj0s41168fk"; + rev = version; + sha256 = "sha256-QaTQ8yUviJaFEQaQm2vYAUngqHliKe8TDYqfWt1Nx/0="; }; patches = [ - # https://github.com/christophgysin/pasystray/issues/90#issuecomment-306190701 - ./fix-wayland.patch - + # Use ayatana-appindicator instead of appindicator # https://github.com/christophgysin/pasystray/issues/98 (fetchpatch { - url = "https://sources.debian.org/data/main/p/pasystray/0.7.1-1/debian/patches/0001-Build-against-ayatana-appindicator.patch"; - sha256 = "0hijphrf52n2zfwdnrmxlp3a7iwznnkb79awvpzplz0ia2lqywpw"; + url = "https://sources.debian.org/data/main/p/pasystray/0.8.1-1/debian/patches/0001-Build-against-ayatana-appindicator.patch"; + sha256 = "sha256-/HKPqVARfHr/3Vyls6a1n8ejxqW9Ztu4+8KK4jK8MkI="; }) - ]; + # Require X11 backend + # https://github.com/christophgysin/pasystray/issues/90#issuecomment-361881076 + (fetchpatch { + url = "https://sources.debian.org/data/main/p/pasystray/0.8.1-1/debian/patches/0002-Require-X11-backend.patch"; + sha256 = "sha256-6njC3vqBPWFS1xAsa1katQ4C0KJdVkHAP1MCPiZ6ELM="; + }) + ]; nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; buildInputs = [ gnome.adwaita-icon-theme - avahi gtk3 libayatana-appindicator-gtk3 libnotify libpulseaudio xlibsWrapper + avahi gtk3 libayatana-appindicator libnotify libpulseaudio gsettings-desktop-schemas ]; |