diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-05 22:56:47 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-13 20:18:45 +0200 |
| commit | a6e4c87391e6696e468fb132cba619e416dd7c1c (patch) | |
| tree | cc4559a29e6a82685318e0093ae8c34ee540c89a /pkgs/applications | |
| parent | f28924173eceb6c9e17a458ccd893f6f8aa51ef4 (diff) | |
| download | nixlib-a6e4c87391e6696e468fb132cba619e416dd7c1c.tar nixlib-a6e4c87391e6696e468fb132cba619e416dd7c1c.tar.gz nixlib-a6e4c87391e6696e468fb132cba619e416dd7c1c.tar.bz2 nixlib-a6e4c87391e6696e468fb132cba619e416dd7c1c.tar.lz nixlib-a6e4c87391e6696e468fb132cba619e416dd7c1c.tar.xz nixlib-a6e4c87391e6696e468fb132cba619e416dd7c1c.tar.zst nixlib-a6e4c87391e6696e468fb132cba619e416dd7c1c.zip | |
gtk3: split into multiple outputs
All references OK, hopefully. Seems surprisingly smooth.
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/graphics/shotwell/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/sweethome3d/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/sweethome3d/editors.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/video/kazam/default.nix | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 052ba9402bed..cbb72471de55 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/shotwell" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" ''; diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 0c9b6e8c08a0..f55d8ed34eeb 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -31,7 +31,7 @@ let cp install/${module}-${version}.jar $out/share/java/. cp "${sweethome3dItem}/share/applications/"* $out/share/applications makeWrapper ${jre}/bin/java $out/bin/$exec \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" ''; diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index 87da1c6643b2..204e5eeae595 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -40,7 +40,7 @@ let cp ${module}-${version}.jar $out/share/java/. cp "${editorItem}/share/applications/"* $out/share/applications makeWrapper ${jre}/bin/java $out/bin/$exec \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-jar $out/share/java/${module}-${version}.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}" ''; diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index 17bf282a459a..1e3f5d57a064 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -34,9 +34,9 @@ python3Packages.buildPythonPackage rec { preFixup = '' wrapProgram $out/bin/kazam \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH ":" "${gtk3}/lib:${gst_all_1.gstreamer}/lib:${keybinder}/lib" \ + --prefix LD_LIBRARY_PATH ":" "${gtk3.out}/lib:${gst_all_1.gstreamer}/lib:${keybinder}/lib" \ --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share" \ + --prefix XDG_DATA_DIRS : "${gtk3.out}/share" \ --set GST_REGISTRY "/tmp/kazam.gstreamer.registry"; ''; |