diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-11 17:11:19 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-13 20:18:58 +0200 |
| commit | 1a5d465395a28429a3331b25dc2955df3fbc75f6 (patch) | |
| tree | 9fd49cc7902a8e835dc242c3859b5836ce49894c /pkgs/development/compilers/openjdk | |
| parent | a3c07f5e9e46db0414be383f2680b9cc6eb5d31c (diff) | |
| download | nixlib-1a5d465395a28429a3331b25dc2955df3fbc75f6.tar nixlib-1a5d465395a28429a3331b25dc2955df3fbc75f6.tar.gz nixlib-1a5d465395a28429a3331b25dc2955df3fbc75f6.tar.bz2 nixlib-1a5d465395a28429a3331b25dc2955df3fbc75f6.tar.lz nixlib-1a5d465395a28429a3331b25dc2955df3fbc75f6.tar.xz nixlib-1a5d465395a28429a3331b25dc2955df3fbc75f6.tar.zst nixlib-1a5d465395a28429a3331b25dc2955df3fbc75f6.zip | |
openjdk: fix build with multiple outputs
It seems freetype can't be found by that flag anymore, after it has been split, but pkgconfig is a better option anyway (tested it finds it).
Diffstat (limited to 'pkgs/development/compilers/openjdk')
| -rw-r--r-- | pkgs/development/compilers/openjdk/8.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 0e9184e1c628..1a280b1d542d 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype +{ stdenv, fetchurl, cpio, pkgconfig, file, which, unzip, zip, xorg, cups, freetype , alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib , setJavaClassPath , minimal ? false @@ -62,6 +62,7 @@ let outputs = [ "out" "jre" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cpio file which unzip zip xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst @@ -89,7 +90,6 @@ let ''; configureFlags = [ - "--with-freetype=${freetype}" "--with-boot-jdk=${bootjdk.home}" "--with-update-version=${update}" "--with-build-number=${build}" |