sweethome3d: version compatible with master and 16.09

[Bjørn: let the package function take 'libXxf86vm' as input instead of
'xorg' (the whole set).]
This commit is contained in:
Matthias Herrmann 2017-02-17 18:59:01 +01:00 committed by Bjørn Forsman
parent 73112a6e78
commit 89a0365063

View File

@ -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 = ''