summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Dietz <github@wdtz.org>2019-01-13 19:51:50 -0600
committerGitHub <noreply@github.com>2019-01-13 19:51:50 -0600
commitd79e351079039b4bb36b5363f45582b6dfafec1d (patch)
tree81b8dba91c992a291dff0a525df4159b5a692793
parent2000d62a504bbe2575bc3aa5c73948e13922952f (diff)
parent16a0eba3f422cd602b1586718e1ff82494306ab6 (diff)
downloadnixpkgs-d79e351079039b4bb36b5363f45582b6dfafec1d.tar
nixpkgs-d79e351079039b4bb36b5363f45582b6dfafec1d.tar.gz
nixpkgs-d79e351079039b4bb36b5363f45582b6dfafec1d.tar.bz2
nixpkgs-d79e351079039b4bb36b5363f45582b6dfafec1d.tar.lz
nixpkgs-d79e351079039b4bb36b5363f45582b6dfafec1d.tar.xz
nixpkgs-d79e351079039b4bb36b5363f45582b6dfafec1d.tar.zst
nixpkgs-d79e351079039b4bb36b5363f45582b6dfafec1d.zip
Merge pull request #53418 from dtzWill/update/pasystray-0.7.1
pasystray: 0.7.0 -> 0.7.1, cleanup
-rw-r--r--pkgs/tools/audio/pasystray/default.nix18
1 files changed, 3 insertions, 15 deletions
diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix
index bd6317bcea1..41b3b15738d 100644
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook
 , gnome3, avahi, gtk3, libappindicator-gtk3, libnotify, libpulseaudio
 , xlibsWrapper
 }:
@@ -14,25 +14,13 @@ stdenv.mkDerivation rec {
     sha256 = "0xx1bm9kimgq11a359ikabdndqg5q54pn1d1dyyjnrj0s41168fk";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ];
   buildInputs = [
-    autoconf automake makeWrapper
     gnome3.defaultIconTheme
     avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper
+    gnome3.gsettings-desktop-schemas
   ];
 
-  preConfigure = ''
-    aclocal
-    autoconf
-    autoheader
-    automake --add-missing
-  '';
-
-  preFixup = ''
-    wrapProgram "$out/bin/pasystray" \
-      --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
   meta = with stdenv.lib; {
     description = "PulseAudio system tray";
     homepage = https://github.com/christophgysin/pasystray;