diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2016-03-22 13:49:49 -0300 |
|---|---|---|
| committer | José Romildo Malaquias <malaquias@gmail.com> | 2016-03-22 14:27:19 -0300 |
| commit | c326507dbec53e0ac33795edf4fd95c0f64aedca (patch) | |
| tree | 366d4d9054bdca25bb11fc322cd83ce4d4b3f4c3 /pkgs/desktops | |
| parent | 5fe5a777e4583fb39d71787e2f3c050ec4835fb3 (diff) | |
| download | nixlib-c326507dbec53e0ac33795edf4fd95c0f64aedca.tar nixlib-c326507dbec53e0ac33795edf4fd95c0f64aedca.tar.gz nixlib-c326507dbec53e0ac33795edf4fd95c0f64aedca.tar.bz2 nixlib-c326507dbec53e0ac33795edf4fd95c0f64aedca.tar.lz nixlib-c326507dbec53e0ac33795edf4fd95c0f64aedca.tar.xz nixlib-c326507dbec53e0ac33795edf4fd95c0f64aedca.tar.zst nixlib-c326507dbec53e0ac33795edf4fd95c0f64aedca.zip | |
gedit: refactor wrapping variables in binaries
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.18/apps/gedit/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
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; { |