pyrox.dev
Merge pull request #68859 from volth/patch-366
jogl: remove #37364 workaround
authored by worldofpeace and committed by GitHub ed41f7e8 19b4d188
+3
-6
pkgs/development/java-modules/jogl/default.nix
+3
-6
pkgs/development/java-modules/jogl/default.nix
···
1
-
{ stdenv, fetchgit, ant, jdk, openjdk8, zulu8, git, xorg, udev, libGL, libGLU }:
2
3
-
let
4
-
# workaround https://github.com/NixOS/nixpkgs/issues/37364
5
-
jdk-without-symlinks = if jdk == openjdk8 then zulu8 else jdk;
6
-
in
7
{
8
jogl_2_3_2 =
9
let
···
32
-exec sed -i 's@"libGLU.so"@"${libGLU}/lib/libGLU.so"@' {} \;
33
'';
34
35
-
buildInputs = [ jdk-without-symlinks ant git udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
36
37
buildPhase = ''
38
cp -r ${gluegen-src} $NIX_BUILD_TOP/gluegen
···
1
+
{ stdenv, fetchgit, ant, jdk, git, xorg, udev, libGL, libGLU }:
2
3
{
4
jogl_2_3_2 =
5
let
···
28
-exec sed -i 's@"libGLU.so"@"${libGLU}/lib/libGLU.so"@' {} \;
29
'';
30
31
+
nativeBuildInputs = [ jdk ant git ];
32
+
buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
33
34
buildPhase = ''
35
cp -r ${gluegen-src} $NIX_BUILD_TOP/gluegen