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/development | |
| parent | 85b1ede2bfa8c8e7cf946a7372d3b05f15e7735a (diff) | |
| download | nixpkgs-35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa.tar nixpkgs-35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa.tar.gz nixpkgs-35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa.tar.bz2 nixpkgs-35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa.tar.lz nixpkgs-35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa.tar.xz nixpkgs-35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa.tar.zst nixpkgs-35ccaa2e52c8d8c09118c72c8ed5c167a394dcfa.zip | |
Fix gsettings schemas usage for several packages due to #1901
Also add icons to epiphany
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/gvfs/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/ibus/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 73b74a12c66..3f20147d0e9 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # ToDo: one probably should specify schemas for samba and others here - fixupPhase = '' - wrapProgram $out/libexec/gvfsd --set GSETTINGS_SCHEMA_DIR "$out/share/glib-2.0/schemas" + preFixup = '' + wrapProgram $out/libexec/gvfsd --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; meta = { diff --git a/pkgs/development/libraries/ibus/default.nix b/pkgs/development/libraries/ibus/default.nix index 75eb1b4134c..905f11dfdc2 100644 --- a/pkgs/development/libraries/ibus/default.nix +++ b/pkgs/development/libraries/ibus/default.nix @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { preBuild = "patchShebangs ./scripts"; - postInstall = '' + preFixup = '' for f in "$out"/bin/*; do - wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share" \ + wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ --prefix PYTHONPATH : "$(toPythonPath ${pygobject3})" \ --prefix LD_LIBRARY_PATH : "${gnome3.gtk3}/lib:${atk}/lib:$out/lib" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ |