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

openjdk: Keep {include,man} in $out/lib/opendjk. (#18140)

Browse Source 
* openjdk: Keep {include,man} in $out/lib/opendjk.

This is a standard layout that some JDK consumers expect.

* openjdk/8: Improve clarity of some symlink commands with terminating slash.
This commit is contained in:
reltuk 2016-09-01 12:00:41 -07:00 committed by Domen Kožar
parent a6670c1a0b
commit 3e695874e2
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,16 +122,17 @@ let
cp -av build/*/images/j2sdk-image/* $out/lib/openjdk cp -av build/*/images/j2sdk-image/* $out/lib/openjdk
# Move some stuff to top-level. # Remove some broken manpages.
mv $out/lib/openjdk/include $out/include rm -rf $out/lib/openjdk/man/ja*
mv $out/lib/openjdk/man $out/share/man
# Mirror some stuff in top-level.
mkdir $out/include $out/share/man
ln -s $out/lib/openjdk/include/* $out/include/
ln -s $out/lib/openjdk/man/* $out/share/man/
# jni.h expects jni_md.h to be in the header search path. # jni.h expects jni_md.h to be in the header search path.
ln -s $out/include/linux/*_md.h $out/include/ ln -s $out/include/linux/*_md.h $out/include/
# Remove some broken manpages.
rm -rf $out/share/man/ja*
# Remove crap from the installation. # Remove crap from the installation.
rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample