sweethome3d: version compatible with master and 16.09

[Bjørn: let the package function take 'libXxf86vm' as input instead of 'xorg' (the whole set).]
NixOS · Feb 17, 2017 · 89a0365 · 89a0365
1 parent 73112a6
commit 89a0365
Showing 1 changed file with 8 additions and 1 deletion.
diff --git 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 = ''