diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-05 11:43:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-05 11:43:35 -0400 |
| commit | d6a202f1628ab64cd28bef7fb4554ac8783a4181 (patch) | |
| tree | 04fbea0c04f36a6a6e6c99398eaf8d3fd7394ee6 /pkgs/development/compilers | |
| parent | 00b44dcb01ddd61a2b1e31bca81f7b62425df44c (diff) | |
| parent | f1c3a610b2404bf00e9a2ff86b63001b781d816b (diff) | |
| download | nixlib-d6a202f1628ab64cd28bef7fb4554ac8783a4181.tar nixlib-d6a202f1628ab64cd28bef7fb4554ac8783a4181.tar.gz nixlib-d6a202f1628ab64cd28bef7fb4554ac8783a4181.tar.bz2 nixlib-d6a202f1628ab64cd28bef7fb4554ac8783a4181.tar.lz nixlib-d6a202f1628ab64cd28bef7fb4554ac8783a4181.tar.xz nixlib-d6a202f1628ab64cd28bef7fb4554ac8783a4181.tar.zst nixlib-d6a202f1628ab64cd28bef7fb4554ac8783a4181.zip | |
Merge pull request #42187 from jameysharp/jdk-without-gnome
openjdk: fix build for !enableGnome2
Diffstat (limited to 'pkgs/development/compilers')
| -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 ]; |