diff options
| author | Jamey Sharp <jamey@minilop.net> | 2018-06-18 15:25:41 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2018-06-18 15:25:41 -0700 |
| commit | f1c3a610b2404bf00e9a2ff86b63001b781d816b (patch) | |
| tree | 9ca2226cb60e82631e4cf48f2c83af6370d8fdc5 /pkgs/development/compilers/openjdk | |
| parent | b30d52905e618c6ae3e5ef0cea41777ee72be835 (diff) | |
| download | nixlib-f1c3a610b2404bf00e9a2ff86b63001b781d816b.tar nixlib-f1c3a610b2404bf00e9a2ff86b63001b781d816b.tar.gz nixlib-f1c3a610b2404bf00e9a2ff86b63001b781d816b.tar.bz2 nixlib-f1c3a610b2404bf00e9a2ff86b63001b781d816b.tar.lz nixlib-f1c3a610b2404bf00e9a2ff86b63001b781d816b.tar.xz nixlib-f1c3a610b2404bf00e9a2ff86b63001b781d816b.tar.zst nixlib-f1c3a610b2404bf00e9a2ff86b63001b781d816b.zip | |
openjdk: fix build for !enableGnome2
This OpenJDK packaging has a headless build configuration controlled by the `minimal` flag, which is regularly build-tested by Hydra, and a non-headless configuration based on pure Xlib libraries without Gnome features, which is not normally tested. Sometime before OpenJDK 8, the !enableGnome2 case broke, because it needs to link against libXrandr but that wasn't included in the buildInputs. If this patch is backported to NixOS 18.03 or earlier, the same fix needs to be applied to OpenJDK 9. I have tested OpenJDK versions 8, 9, and 10, but not any other versions.
Diffstat (limited to 'pkgs/development/compilers/openjdk')
| -rw-r--r-- | pkgs/development/compilers/openjdk/10.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/openjdk/8.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix index 7882fa49b07e..2c76d59512b6 100644 --- a/pkgs/development/compilers/openjdk/10.nix +++ b/pkgs/development/compilers/openjdk/10.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype , alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir -, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor +, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib , setJavaClassPath , minimal ? false @@ -36,7 +36,7 @@ let buildInputs = [ cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst - libXi libXinerama libXcursor lndir fontconfig + libXi libXinerama libXcursor libXrandr lndir fontconfig ] ++ lib.optionals (!minimal && enableGnome2) [ gtk3 gnome_vfs GConf glib ]; diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 9db5e8ba23c9..57771e383279 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, bash, cpio, pkgconfig, file, which, unzip, zip, cups, freetype , alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir -, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor +, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr , libjpeg, giflib , setJavaClassPath , minimal ? false @@ -70,7 +70,7 @@ let buildInputs = [ cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst - libXi libXinerama libXcursor lndir fontconfig + libXi libXinerama libXcursor libXrandr lndir fontconfig ] ++ lib.optionals (!minimal && enableGnome2) [ gtk2 gnome_vfs GConf glib ]; |