diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-08 16:57:40 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-08 18:35:40 +0200 |
| commit | c4877df3889811359b0c76dfc397692979d3f671 (patch) | |
| tree | c2fc0123c45a1fdc4a235e3d715ba9d245139381 /pkgs/development/compilers/openjdk | |
| parent | ce6c23d8a6722652ff822673d8d31c91ba50641a (diff) | |
| download | nixlib-c4877df3889811359b0c76dfc397692979d3f671.tar nixlib-c4877df3889811359b0c76dfc397692979d3f671.tar.gz nixlib-c4877df3889811359b0c76dfc397692979d3f671.tar.bz2 nixlib-c4877df3889811359b0c76dfc397692979d3f671.tar.lz nixlib-c4877df3889811359b0c76dfc397692979d3f671.tar.xz nixlib-c4877df3889811359b0c76dfc397692979d3f671.tar.zst nixlib-c4877df3889811359b0c76dfc397692979d3f671.zip | |
openjdk: Drop dependency on CUPS
We only need the CUPS headers, not the whole package.
Diffstat (limited to 'pkgs/development/compilers/openjdk')
| -rw-r--r-- | pkgs/development/compilers/openjdk/default.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index fbbae4956661..008eb991a6ad 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype, cups +{ stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype , which, jdk, nettools, xorg, file , fontconfig, cpio, cacert, perl, setJavaClassPath }: @@ -22,6 +22,11 @@ let # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. paxflags = if stdenv.isi686 then "msp" else "m"; + cupsSrc = fetchurl { + url = http://ftp.easysw.com/pub/cups/1.5.4/cups-1.5.4-source.tar.bz2; + md5 = "de3006e5cf1ee78a9c6145ce62c4e982"; + }; + in stdenv.mkDerivation rec { @@ -50,6 +55,10 @@ stdenv.mkDerivation rec { sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \ openjdk/{jdk,corba}/make/common/shared/Defs-utils.gmk + + tar xf ${cupsSrc} + cupsDir=$(echo $(pwd)/cups-*) + makeFlagsArray+=(CUPS_HEADERS_PATH=$cupsDir) ''; patches = [ ./cppflags-include-fix.patch ./fix-java-home.patch ./paxctl.patch ]; @@ -63,7 +72,6 @@ stdenv.mkDerivation rec { "FREETYPE_LIB_PATH=${freetype}/lib" "MILESTONE=release" "BUILD_NUMBER=b${build}" - "CUPS_HEADERS_PATH=${cups}/include" "USRBIN_PATH=" "COMPILER_PATH=" "DEVTOOLS_PATH=" @@ -158,7 +166,7 @@ stdenv.mkDerivation rec { homepage = http://openjdk.java.net/; license = "GPLv2"; description = "The open-source Java Development Kit"; - maintainers = [ stdenv.lib.maintainers.shlevy ]; + maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.linux; }; |