From c326507dbec53e0ac33795edf4fd95c0f64aedca Mon Sep 17 00:00:00 2001
From: José Romildo Malaquias <malaquias@gmail.com>
Date: Tue, 22 Mar 2016 13:49:49 -0300
Subject: gedit: refactor wrapping variables in binaries

---
 pkgs/desktops/gnome-3/3.18/apps/gedit/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'pkgs/desktops')

diff --git a/pkgs/desktops/gnome-3/3.18/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gedit/default.nix
index 6cff4bdee482..6c852ddae5c8 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/gedit/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, enchant, isocodes
 , pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, libsoup, libxml2
+, bash, wrapGAppsHook, itstool, libsoup, libxml2
 , gnome3, librsvg, gdk_pixbuf, file }:
 
 stdenv.mkDerivation rec {
@@ -8,19 +8,17 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
+  buildInputs = [ gtk3 glib intltool itstool enchant isocodes
                   gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup
                   gnome3.libpeas gnome3.gtksourceview libxml2
-                  gnome3.gsettings_desktop_schemas makeWrapper file ];
+                  gnome3.gsettings_desktop_schemas gnome3.dconf file ];
 
   enableParallelBuilding = true;
 
   preFixup = ''
-    wrapProgram "$out/bin/gedit" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib")
   '';
 
   meta = with stdenv.lib; {
-- 
cgit 1.4.1