From 89a036506396dd869474a32e984f5cab5c07992a Mon Sep 17 00:00:00 2001 From: Matthias Herrmann Date: Fri, 17 Feb 2017 18:59:01 +0100 Subject: [PATCH] sweethome3d: version compatible with master and 16.09 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Bjørn: let the package function take 'libXxf86vm' as input instead of 'xorg' (the whole set).] --- pkgs/applications/misc/sweethome3d/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 4a530a927815..62e66e4ad38e 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 = ''