Merge pull request #2244 from lethalman/gsettings

audacious, sflphone: find gsettings schemas
This commit is contained in:
Domen Kožar 2014-04-14 09:43:35 +02:00
commit 6449bc2f23
2 changed files with 5 additions and 3 deletions

View file

@ -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
)
'';

View file

@ -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 ];