public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openjdk: fix build with multiple outputs

Browse Source 
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).
This commit is contained in:
Vladimír Čunát 2015-10-11 17:11:19 +02:00
parent a3c07f5e9e
commit 1a5d465395
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/openjdk/8.nix
View File

@ -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 , alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib
, setJavaClassPath , setJavaClassPath
, minimal ? false , minimal ? false
@ -62,6 +62,7 @@ let
outputs = [ "out" "jre" ]; outputs = [ "out" "jre" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
cpio file which unzip zip cpio file which unzip zip
xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst
@ -89,7 +90,6 @@ let
''; '';
configureFlags = [ configureFlags = [
"--with-freetype=${freetype}"
"--with-boot-jdk=${bootjdk.home}" "--with-boot-jdk=${bootjdk.home}"
"--with-update-version=${update}" "--with-update-version=${update}"
"--with-build-number=${build}" "--with-build-number=${build}"