diff options
| author | Luca Bruno <lucabru@src.gnome.org> | 2014-04-05 15:51:42 +0200 |
|---|---|---|
| committer | Luca Bruno <lucabru@src.gnome.org> | 2014-04-06 11:02:21 +0200 |
| commit | 35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa (patch) | |
| tree | ad05c2096039b9f050f821722a28173b64819949 /pkgs/applications/misc/surf | |
| parent | 85b1ede2bfa8c8e7cf946a7372d3b05f15e7735a (diff) | |
| download | nixlib-35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa.tar nixlib-35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa.tar.gz nixlib-35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa.tar.bz2 nixlib-35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa.tar.lz nixlib-35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa.tar.xz nixlib-35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa.tar.zst nixlib-35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa.zip | |
Fix gsettings schemas usage for several packages due to #1901
Also add icons to epiphany
Diffstat (limited to 'pkgs/applications/misc/surf')
| -rw-r--r-- | pkgs/applications/misc/surf/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
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 = { |