diff options
author | José Romildo Malaquias <malaquias@gmail.com> | 2016-03-22 13:52:39 -0300 |
---|---|---|
committer | José Romildo Malaquias <malaquias@gmail.com> | 2016-03-22 14:28:34 -0300 |
commit | 5b642fb8dbdade03635a59589339a43bab50cde6 (patch) | |
tree | 45454cead5a099edf9deb84853480bb3837f6963 /pkgs | |
parent | c326507dbec53e0ac33795edf4fd95c0f64aedca (diff) | |
download | nixlib-5b642fb8dbdade03635a59589339a43bab50cde6.tar nixlib-5b642fb8dbdade03635a59589339a43bab50cde6.tar.gz nixlib-5b642fb8dbdade03635a59589339a43bab50cde6.tar.bz2 nixlib-5b642fb8dbdade03635a59589339a43bab50cde6.tar.lz nixlib-5b642fb8dbdade03635a59589339a43bab50cde6.tar.xz nixlib-5b642fb8dbdade03635a59589339a43bab50cde6.tar.zst nixlib-5b642fb8dbdade03635a59589339a43bab50cde6.zip |
epiphany: refactor wrapping variables in binaries
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix index ff21da4a28c8..322dd3bedac6 100644 --- a/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu -, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool +, bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool , webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit , sqlite, gcr, avahi, nss, isocodes, itstool, file, which , gdk_pixbuf, librsvg, gnome_common }: @@ -12,27 +12,18 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - nativeBuildInputs = [ pkgconfig file ]; + nativeBuildInputs = [ pkgconfig file wrapGAppsHook ]; buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file webkitgtk libsoup libsecret gnome_desktop libnotify libtool sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common - gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ]; + gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf ]; NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0"; enableParallelBuilding = true; - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram "$f" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done - ''; - meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Epiphany; description = "WebKit based web browser for GNOME"; |