jogl: reflect recent changes in opengl (#41786)

This commit is contained in:
volth 2018-06-10 15:09:19 +00:00 committed by xeji
parent fc9ffe790f
commit 70050dbc48

View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, makeWrapper, ant, jdk, openjdk8, zulu8, git, xorg, udev }: { stdenv, fetchgit, makeWrapper, ant, jdk, openjdk8, zulu8, git, xorg, udev, libGL, libGLU }:
let let
# workaround https://github.com/NixOS/nixpkgs/issues/37364 # workaround https://github.com/NixOS/nixpkgs/issues/37364
@ -19,12 +19,18 @@ in
name = "jogl-${version}"; name = "jogl-${version}";
src = fetchgit { src = fetchgit {
url = http://jogamp.org/srv/scm/jogl.git; url = git://jogamp.org/srv/scm/jogl.git;
rev = "v${version}"; rev = "v${version}";
sha256 = "0msi2gxiqm2yqwkmxqbh521xdrimw1fly20g890r357rcgj8fsn3"; sha256 = "0msi2gxiqm2yqwkmxqbh521xdrimw1fly20g890r357rcgj8fsn3";
fetchSubmodules = true; fetchSubmodules = true;
}; };
postPatch = ''
find . -type f -name '*.java' \
-exec sed -i 's@"libGL.so"@"${libGL}/lib/libGL.so"@' {} \; \
-exec sed -i 's@"libGLU.so"@"${libGLU}/lib/libGLU.so"@' {} \;
'';
buildInputs = [ jdk-without-symlinks ant git udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ]; buildInputs = [ jdk-without-symlinks ant git udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
buildPhase = '' buildPhase = ''