From 16a0eba3f422cd602b1586718e1ff82494306ab6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 4 Jan 2019 14:03:44 -0600
Subject: [PATCH] pasystray: 0.7.0 -> 0.7.1, cleanup

---
 pkgs/tools/audio/pasystray/default.nix | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix
index 57896fd7f63..41b3b15738d 100644
--- a/pkgs/tools/audio/pasystray/default.nix
+++ b/pkgs/tools/audio/pasystray/default.nix
@@ -1,38 +1,26 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, makeWrapper, pkgconfig
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook
 , gnome3, avahi, gtk3, libappindicator-gtk3, libnotify, libpulseaudio
 , xlibsWrapper
 }:
 
 stdenv.mkDerivation rec {
   name = "pasystray-${version}";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "christophgysin";
     repo = "pasystray";
     rev = name;
-    sha256 = "0cc9hjyw4gr4ip4lw74pzb1l9sxs3ffhf0xn0m1fhmyfbjyixwkh";
+    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;