diff options
| author | reltuk <reltuk@gmail.com> | 2016-09-01 12:00:41 -0700 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-09-01 21:00:41 +0200 |
| commit | 3e695874e2f6469f9882f1c8aeb62e90aa9c4fa5 (patch) | |
| tree | 703db0f7de0cfd8d7892ece80b01868fa2867bf8 /pkgs/development/compilers/openjdk | |
| parent | a6670c1a0b8cda8235296900cff950f39f60cf4f (diff) | |
| download | nixlib-3e695874e2f6469f9882f1c8aeb62e90aa9c4fa5.tar nixlib-3e695874e2f6469f9882f1c8aeb62e90aa9c4fa5.tar.gz nixlib-3e695874e2f6469f9882f1c8aeb62e90aa9c4fa5.tar.bz2 nixlib-3e695874e2f6469f9882f1c8aeb62e90aa9c4fa5.tar.lz nixlib-3e695874e2f6469f9882f1c8aeb62e90aa9c4fa5.tar.xz nixlib-3e695874e2f6469f9882f1c8aeb62e90aa9c4fa5.tar.zst nixlib-3e695874e2f6469f9882f1c8aeb62e90aa9c4fa5.zip | |
openjdk: Keep {include,man} in $out/lib/opendjk. (#18140)
* 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.
Diffstat (limited to 'pkgs/development/compilers/openjdk')
| -rw-r--r-- | pkgs/development/compilers/openjdk/8.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index ffe116c81580..50199852ae2f 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -122,16 +122,17 @@ let cp -av build/*/images/j2sdk-image/* $out/lib/openjdk - # Move some stuff to top-level. - mv $out/lib/openjdk/include $out/include - mv $out/lib/openjdk/man $out/share/man + # Remove some broken manpages. + rm -rf $out/lib/openjdk/man/ja* + + # 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. ln -s $out/include/linux/*_md.h $out/include/ - # Remove some broken manpages. - rm -rf $out/share/man/ja* - # Remove crap from the installation. rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample |