From 35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 5 Apr 2014 15:51:42 +0200 Subject: Fix gsettings schemas usage for several packages due to #1901 Also add icons to epiphany --- pkgs/applications/misc/surf/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/misc/surf') diff --git a/pkgs/applications/misc/surf/default.nix b/pkgs/applications/misc/surf/default.nix index 42792ba8f91d..651cfcca4067 100644 --- a/pkgs/applications/misc/surf/default.nix +++ b/pkgs/applications/misc/surf/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "01b8hq8z2wd7ssym5bypx2b15mrs1lhgkrcgxf700kswxvxcrhgx"; }; - buildInputs = [ gtk makeWrapper webkit pkgconfig glib libsoup ]; + buildInputs = [ gtk makeWrapper webkit gsettings_desktop_schemas pkgconfig glib libsoup ]; # Allow users set their own list of patches inherit patches; @@ -21,9 +21,12 @@ stdenv.mkDerivation rec { preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ]; installPhase = '' make PREFIX=/ DESTDIR=$out install + ''; + + preFixup = '' wrapProgram "$out/bin/surf" \ --prefix GIO_EXTRA_MODULES : ${glib_networking}/lib/gio/modules \ - --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share" + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; meta = { -- cgit 1.4.1