diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
commit | ab15a62c68bf7bf3b02e3bab00d121cc1426733c (patch) | |
tree | 398a82403b04bfa0bae8cadf1c5a64cf83145965 /pkgs/desktops/gnome-3/3.18/apps/gedit/default.nix | |
parent | c643ccaa8c91f78b8c89eb87589886b8906d5b38 (diff) | |
parent | a26357eefe017964448b5bb464163646b927a267 (diff) | |
download | nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.gz nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.bz2 nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.lz nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.xz nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.zst nixlib-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.zip |
Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
Diffstat (limited to 'pkgs/desktops/gnome-3/3.18/apps/gedit/default.nix')
-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; { |