treewide: Fix output references to gtk

This commit is contained in:
Tuomas Tynkkynen 2016-08-23 04:34:48 +03:00
parent df4ebf5f1a
commit 5ae4471fb5
2 changed files with 2 additions and 2 deletions

View File

@ -77,7 +77,7 @@ rec {
# gtk3 programs have the runtime dependency on XDG_DATA_DIRS # gtk3 programs have the runtime dependency on XDG_DATA_DIRS
preFixup = '' preFixup = ''
for f in "$out/bin/sflphone" "$out/bin/sflphone-client-gnome"; do for f in "$out/bin/sflphone" "$out/bin/sflphone-client-gnome"; do
wrapProgram $f --prefix XDG_DATA_DIRS ":" "${gtk}/share:$GSETTINGS_SCHEMAS_PATH" wrapProgram $f --prefix XDG_DATA_DIRS ":" "${gtk.out}/share:$GSETTINGS_SCHEMAS_PATH"
done done
''; '';

View File

@ -135,7 +135,7 @@ stdenv.mkDerivation rec {
makeWrapper "$ICAInstDir/wfica -icaroot $ICAInstDir" "$out/bin/wfica" \ makeWrapper "$ICAInstDir/wfica -icaroot $ICAInstDir" "$out/bin/wfica" \
--set ICAROOT "$ICAInstDir" \ --set ICAROOT "$ICAInstDir" \
--set GTK_PATH "${gtk}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \ --set GTK_PATH "${gtk.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
--set LD_LIBRARY_PATH "$libPath" \ --set LD_LIBRARY_PATH "$libPath" \