diff options
| author | volth <volth@volth.com> | 2019-09-15 19:00:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-15 19:00:15 +0000 |
| commit | 7b7848ecb69c1bad9958585dcc215927815a7c84 (patch) | |
| tree | 10ea3e779d11439421de53aadd73ecd278cfe8b0 /pkgs/development/java-modules | |
| parent | 3ddbe41f7951d4dba5f5c9ff6cbdd9337da2014e (diff) | |
| download | nixpkgs-7b7848ecb69c1bad9958585dcc215927815a7c84.tar nixpkgs-7b7848ecb69c1bad9958585dcc215927815a7c84.tar.gz nixpkgs-7b7848ecb69c1bad9958585dcc215927815a7c84.tar.bz2 nixpkgs-7b7848ecb69c1bad9958585dcc215927815a7c84.tar.lz nixpkgs-7b7848ecb69c1bad9958585dcc215927815a7c84.tar.xz nixpkgs-7b7848ecb69c1bad9958585dcc215927815a7c84.tar.zst nixpkgs-7b7848ecb69c1bad9958585dcc215927815a7c84.zip | |
jogl: remove #37364 workaround
Diffstat (limited to 'pkgs/development/java-modules')
| -rw-r--r-- | pkgs/development/java-modules/jogl/default.nix | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix index d179fb53178..80f19ab65f5 100644 --- a/pkgs/development/java-modules/jogl/default.nix +++ b/pkgs/development/java-modules/jogl/default.nix @@ -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 |