alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

openjdk: Use makeFlags properly

Browse source 
svn path=/nixpkgs/trunk/; revision=28083
This commit is contained in:
Shea Levy 2011-08-01 01:15:29 +00:00
parent 58d64db27d
commit 5fca670490
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
pkgs/development/compilers/openjdk/default.nix
View file

@ -31,25 +31,25 @@ stdenv.mkDerivation rec {
openjdk/hotspot/make/linux/makefiles/sa.make openjdk/hotspot/make/linux/makefiles/sa.make
''; '';
makeFlags = '' makeFlags = [
ECHO=${coreutils}/bin/echo \ "ECHO=${coreutils}/bin/echo"
SORT=${coreutils}/bin/sort \ "SORT=${coreutils}/bin/sort"
ALSA_INCLUDE=${alsaLib}/include/alsa/version.h \ "ALSA_INCLUDE=${alsaLib}/include/alsa/version.h"
FREETYPE_HEADERS_PATH=${freetype}/include \ "FREETYPE_HEADERS_PATH=${freetype}/include"
FREETYPE_LIB_PATH=${freetype}/lib \ "FREETYPE_LIB_PATH=${freetype}/lib"
MILESTONE="release" \ "MILESTONE=release"
BUILD_NUMBER="127" \ "BUILD_NUMBER=127"
CUPS_HEADERS_PATH="${cups}/include" \ "CUPS_HEADERS_PATH=${cups}/include"
USRBIN_PATH="" \ "USRBIN_PATH="
COMPILER_PATH="" \ "COMPILER_PATH="
DEVTOOLS_PATH="" \ "DEVTOOLS_PATH="
UNIXCOMMAND_PATH="" \ "UNIXCOMMAND_PATH="
BOOTDIR=${jdk} \ "BOOTDIR=${jdk}"
ALLOW_DOWNLOADS=true "ALLOW_DOWNLOADS=true"
''; ];
configurePhase = '' configurePhase = ''
make ${makeFlags} sanity make $makeFlags sanity
''; '';
} }