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/misc/sweethome3d | |
| parent | f28924173eceb6c9e17a458ccd893f6f8aa51ef4 (diff) | |
| download | nixpkgs-a6e4c87391e6696e468fb132cba619e416dd7c1c.tar nixpkgs-a6e4c87391e6696e468fb132cba619e416dd7c1c.tar.gz nixpkgs-a6e4c87391e6696e468fb132cba619e416dd7c1c.tar.bz2 nixpkgs-a6e4c87391e6696e468fb132cba619e416dd7c1c.tar.lz nixpkgs-a6e4c87391e6696e468fb132cba619e416dd7c1c.tar.xz nixpkgs-a6e4c87391e6696e468fb132cba619e416dd7c1c.tar.zst nixpkgs-a6e4c87391e6696e468fb132cba619e416dd7c1c.zip | |
gtk3: split into multiple outputs
All references OK, hopefully. Seems surprisingly smooth.
Diffstat (limited to 'pkgs/applications/misc/sweethome3d')
| -rw-r--r-- | pkgs/applications/misc/sweethome3d/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/misc/sweethome3d/editors.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 0c9b6e8c08a..f55d8ed34ee 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 87da1c6643b..204e5eeae59 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"}" ''; |