diff options
| author | Matthias Herrmann <matthias.mh.herrmann@googlemail.com> | 2017-02-17 18:59:01 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2017-02-17 19:28:52 +0100 |
| commit | 89a036506396dd869474a32e984f5cab5c07992a (patch) | |
| tree | 5c1d8d7aad7c06be3fdddfba7729a82c5ed5d1b4 /pkgs/applications/misc/sweethome3d | |
| parent | 73112a6e788a0f41190bcf3d3a2247c2fc17a1e8 (diff) | |
sweethome3d: version compatible with master and 16.09
[Bjørn: let the package function take 'libXxf86vm' as input instead of
'xorg' (the whole set).]
Diffstat (limited to 'pkgs/applications/misc/sweethome3d')
| -rw-r--r-- | pkgs/applications/misc/sweethome3d/default.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 4a530a92781..62e66e4ad38 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant -, gtk3, gsettings_desktop_schemas, p7zip }: +, gtk3, gsettings_desktop_schemas, p7zip, libXxf86vm }: let @@ -29,6 +29,13 @@ let categories = "Application;Graphics;2DGraphics;3DGraphics;"; }; + patchPhase = '' + patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_awt.so + patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_x11.so + patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_awt.so + patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so + ''; + buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings_desktop_schemas ]; buildPhase = '' |