diff options
| author | Edward Tjörnhammar <ed@cflags.cc> | 2015-05-20 01:55:05 +0200 |
|---|---|---|
| committer | Edward Tjörnhammar <ed@cflags.cc> | 2015-05-20 01:55:34 +0200 |
| commit | e48f5bc19813e50fe8c9d4ecccd2ac033b2b7c0e (patch) | |
| tree | 3a7bfeeb509de7b4eb1744c114d44c4b57bccf64 /pkgs/development/compilers/openjdk | |
| parent | 9205d01e1e3b945e0bace8a99e157e96550b9055 (diff) | |
| download | nixlib-e48f5bc19813e50fe8c9d4ecccd2ac033b2b7c0e.tar nixlib-e48f5bc19813e50fe8c9d4ecccd2ac033b2b7c0e.tar.gz nixlib-e48f5bc19813e50fe8c9d4ecccd2ac033b2b7c0e.tar.bz2 nixlib-e48f5bc19813e50fe8c9d4ecccd2ac033b2b7c0e.tar.lz nixlib-e48f5bc19813e50fe8c9d4ecccd2ac033b2b7c0e.tar.xz nixlib-e48f5bc19813e50fe8c9d4ecccd2ac033b2b7c0e.tar.zst nixlib-e48f5bc19813e50fe8c9d4ecccd2ac033b2b7c0e.zip | |
openjdk8: readd symlinks and remove useless makeflags
Diffstat (limited to 'pkgs/development/compilers/openjdk')
| -rw-r--r-- | pkgs/development/compilers/openjdk/openjdk8.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index 95248dac76af..63d42e6e3d64 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -50,13 +50,16 @@ let ''; prePatch = '' # despite --with-override-jdk the build still searchs here - # GNU Patch bug, follow symlinks only follow the last symlink.. + # GNU Patch bug, --follow-symlinks only follow the last dir part symlink mv "../jdk-${repover}" "jdk"; mv "../hotspot-${repover}" "hotspot"; ''; postPatch = '' mv jdk "../jdk-${repover}"; mv hotspot "../hotspot-${repover}"; + # Patching is over, lets re-add the links + ln -s "../jdk-${repover}" "jdk" + ln -s "../hotspot-${repover}" "hotspot" ''; patches = [ ./fix-java-home-jdk8.patch @@ -83,7 +86,7 @@ let "--with-milestone=fcs" ]; NIX_LDFLAGS= "-lfontconfig"; - buildFlags = "DEBUG_BINARIES=true all"; + buildFlags = "all"; installPhase = '' mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk |