cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #68859 from volth/patch-366

Browse source 
jogl: remove #37364 workaround
This commit is contained in:
worldofpeace 2019-09-21 12:46:52 -04:00 committed by GitHub
commit ed41f7e8f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/development/java-modules/jogl/default.nix
View file

@ -1,9 +1,5 @@
{ stdenv, fetchgit, ant, jdk, openjdk8, zulu8, git, xorg, udev, libGL, libGLU }:
{ stdenv, fetchgit, ant, jdk, git, xorg, udev, libGL, libGLU }:
let
# workaround https://github.com/NixOS/nixpkgs/issues/37364
jdk-without-symlinks = if jdk == openjdk8 then zulu8 else jdk;
in
{
jogl_2_3_2 =
let
@ -32,7 +28,8 @@ in
-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 ];
nativeBuildInputs = [ jdk ant git ];
buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
buildPhase = ''
cp -r ${gluegen-src} $NIX_BUILD_TOP/gluegen