From 106c5b58f105f67c76b91b1b1da64977529b99e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 12 Jun 2016 08:27:19 -0300 Subject: [PATCH] gksu: use nativeBuildInputs and wrapGAppsHook --- pkgs/applications/misc/gksu/default.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index 61fd44925b7..2f19f830282 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, makeWrapper, gtk, gnome3, libgksu, - intltool, libstartup_notification, gtk_doc +{ stdenv, fetchurl, pkgconfig, gtk, gnome3, libgksu, + intltool, libstartup_notification, gtk_doc, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -12,6 +12,18 @@ stdenv.mkDerivation rec { sha256 = "0npfanlh28daapkg25q4fncxd89rjhvid5fwzjaw324x0g53vpm1"; }; + nativeBuildInputs = [ + pkgconfig intltool gtk_doc wrapGAppsHook + ]; + + buildInputs = [ + gtk gnome3.gconf libstartup_notification gnome3.libgnome_keyring + ]; + + propagatedBuildInputs = [ + libgksu + ]; + patches = [ # https://savannah.nongnu.org/bugs/index.php?36127 ./gksu-2.0.2-glib-2.31.patch @@ -23,15 +35,6 @@ stdenv.mkDerivation rec { configureFlags = "--disable-nautilus-extension"; - buildInputs = [ - pkgconfig makeWrapper gtk gnome3.gconf intltool - libstartup_notification gnome3.libgnome_keyring gtk_doc - ]; - - propagatedBuildInputs = [ - libgksu - ]; - meta = { description = "A graphical frontend for libgksu"; longDescription = ''