summary refs log tree commit diff
path: root/pkgs/development/java-modules
diff options
context:
space:
mode:
authorGabriel Ebner <gebner@gebner.org>2020-09-19 15:36:35 +0200
committerGabriel Ebner <gebner@gebner.org>2020-09-19 15:36:35 +0200
commitd74d629fffcc6e730ed16ef0039abea1c1b68d91 (patch)
tree6a2f2bf52acb05d1f59fd4be39c19838b3c583cd /pkgs/development/java-modules
parente5ae2a019fffed513efd108f946e2d02b2db2466 (diff)
downloadnixpkgs-d74d629fffcc6e730ed16ef0039abea1c1b68d91.tar
nixpkgs-d74d629fffcc6e730ed16ef0039abea1c1b68d91.tar.gz
nixpkgs-d74d629fffcc6e730ed16ef0039abea1c1b68d91.tar.bz2
nixpkgs-d74d629fffcc6e730ed16ef0039abea1c1b68d91.tar.lz
nixpkgs-d74d629fffcc6e730ed16ef0039abea1c1b68d91.tar.xz
nixpkgs-d74d629fffcc6e730ed16ef0039abea1c1b68d91.tar.zst
nixpkgs-d74d629fffcc6e730ed16ef0039abea1c1b68d91.zip
javaPackages.jogl_2_3_2: use jdk8
Diffstat (limited to 'pkgs/development/java-modules')
-rw-r--r--pkgs/development/java-modules/jogl/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix
index 574629d8efd..d4e5f1b62bf 100644
--- a/pkgs/development/java-modules/jogl/default.nix
+++ b/pkgs/development/java-modules/jogl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, ant, jdk, git, xorg, udev, libGL, libGLU }:
+{ stdenv, fetchgit, ant, jdk8, git, xorg, udev, libGL, libGLU }:
 
 {
   jogl_2_3_2 =
@@ -28,7 +28,8 @@
           -exec sed -i 's@"libGLU.so"@"${libGLU}/lib/libGLU.so"@' {} \;
       '';
 
-      nativeBuildInputs = [ jdk ant git ];
+      # TODO: upgrade to jdk https://github.com/NixOS/nixpkgs/pull/89731
+      nativeBuildInputs = [ jdk8 ant git ];
       buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
 
       buildPhase = ''