aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/java-modules
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2018-03-19 08:44:21 +0000
committervolth <volth@volth.com>2018-03-19 08:44:21 +0000
commit887e6302bdfa9b93fedf022181b0f20c510b9cc0 (patch)
tree575688cbc8270557db7078aa6684ea1c17702fa1 /pkgs/development/java-modules
parent94ff822eec9376f998a2e6f9255ab9643a53c860 (diff)
jogl: temporary workaround for openjdk8
Diffstat (limited to 'pkgs/development/java-modules')
-rw-r--r--pkgs/development/java-modules/jogl/default.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix
index 03d5a05942fb..474eaa0e1dc4 100644
--- a/pkgs/development/java-modules/jogl/default.nix
+++ b/pkgs/development/java-modules/jogl/default.nix
@@ -1,5 +1,9 @@
-{ stdenv, fetchgit, makeWrapper, ant, jdk, git, xorg, udev }:
+{ stdenv, fetchgit, makeWrapper, ant, jdk, openjdk8, zulu8, git, xorg, udev }:
+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
@@ -21,7 +25,7 @@
fetchSubmodules = true;
};
- buildInputs = [ jdk 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 = ''
cp -r ${gluegen-src} $NIX_BUILD_TOP/gluegen