diff options
| author | Domen Kožar <domen@dev.si> | 2014-04-14 09:43:35 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-04-14 09:43:35 +0200 |
| commit | 6449bc2f239ffab6e8b8470994c5960f774fca5c (patch) | |
| tree | 6460aaa473e64df84c33c6c443f085077c5d7604 /pkgs/applications | |
| parent | 722143a5d365ab084bc69db4aa4258d0b4a8c549 (diff) | |
| parent | 57b6ecb7999ce57fc131837ba26929f148a56034 (diff) | |
| download | nixlib-6449bc2f239ffab6e8b8470994c5960f774fca5c.tar nixlib-6449bc2f239ffab6e8b8470994c5960f774fca5c.tar.gz nixlib-6449bc2f239ffab6e8b8470994c5960f774fca5c.tar.bz2 nixlib-6449bc2f239ffab6e8b8470994c5960f774fca5c.tar.lz nixlib-6449bc2f239ffab6e8b8470994c5960f774fca5c.tar.xz nixlib-6449bc2f239ffab6e8b8470994c5960f774fca5c.tar.zst nixlib-6449bc2f239ffab6e8b8470994c5960f774fca5c.zip | |
Merge pull request #2244 from lethalman/gsettings
audacious, sflphone: find gsettings schemas
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/audio/audacious/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/sflphone/default.nix | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index d838d29e8be1..409a831727bb 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { source $stdenv/setup # gsettings schemas for file dialogues for file in "$out/bin/"*; do - wrapProgram "$file" --prefix XDG_DATA_DIRS : "$XDG_ADD" + wrapProgram "$file" --prefix XDG_DATA_DIRS : "$XDG_ADD:$GSETTINGS_SCHEMAS_PATH" done ) ''; diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix index 2401d796bfdc..a31a682abf88 100644 --- a/pkgs/applications/networking/instant-messengers/sflphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/sflphone/default.nix @@ -75,8 +75,10 @@ rec { ''; # gtk3 programs have the runtime dependency on XDG_DATA_DIRS - postInstall = '' - wrapProgram $out/bin/sflphone* --prefix XDG_DATA_DIRS ":" ${gtk}/share + preFixup = '' + for f in "$out/bin/sflphone" "$out/bin/sflphone-client-gnome"; do + wrapProgram $f --prefix XDG_DATA_DIRS ":" "${gtk}/share:$GSETTINGS_SCHEMAS_PATH" + done ''; buildInputs = [ daemon pkgconfig gtk glib dbus_glib libnotify intltool makeWrapper ]; |