dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

openjdk8: readd symlinks and remove useless makeflags

Browse Source
This commit is contained in:
Edward Tjörnhammar 2015-05-20 01:55:05 +02:00
parent 9205d01e1e
commit e48f5bc198
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/compilers/openjdk/openjdk8.nix
View File

@ -50,13 +50,16 @@ let
''; '';
prePatch = '' prePatch = ''
# despite --with-override-jdk the build still searchs here # 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 "../jdk-${repover}" "jdk";
mv "../hotspot-${repover}" "hotspot"; mv "../hotspot-${repover}" "hotspot";
''; '';
postPatch = '' postPatch = ''
mv jdk "../jdk-${repover}"; mv jdk "../jdk-${repover}";
mv hotspot "../hotspot-${repover}"; mv hotspot "../hotspot-${repover}";
# Patching is over, lets re-add the links
ln -s "../jdk-${repover}" "jdk"
ln -s "../hotspot-${repover}" "hotspot"
''; '';
patches = [ patches = [
./fix-java-home-jdk8.patch ./fix-java-home-jdk8.patch
@ -83,7 +86,7 @@ let
"--with-milestone=fcs" "--with-milestone=fcs"
]; ];
NIX_LDFLAGS= "-lfontconfig"; NIX_LDFLAGS= "-lfontconfig";
buildFlags = "DEBUG_BINARIES=true all"; buildFlags = "all";
installPhase = '' installPhase = ''
mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk