From 416f10528a64515f20715001bdfdcdf2c1b9b7fd Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Tue, 22 Mar 2016 13:31:41 -0300 Subject: dconf-editor: refactor wrapping variables in binaries --- pkgs/desktops/gnome-3/3.18/core/dconf-editor/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'pkgs/desktops') diff --git a/pkgs/desktops/gnome-3/3.18/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.18/core/dconf-editor/default.nix index 5b2b055fe668..bf39965bf779 100644 --- a/pkgs/desktops/gnome-3/3.18/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/dconf-editor/default.nix @@ -1,16 +1,13 @@ { stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 -, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }: +, libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; - buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme - intltool docbook_xsl docbook_xsl_ns makeWrapper gnome3.dconf ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - preFixup = '' - wrapProgram "$out/bin/dconf-editor" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; + buildInputs = [ vala libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme + intltool docbook_xsl docbook_xsl_ns gnome3.dconf ]; meta = with stdenv.lib; { platforms = platforms.linux; -- cgit 1.4.1