diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2016-01-23 09:54:07 +0100 |
|---|---|---|
| committer | Gabriel Ebner <gebner@gebner.org> | 2016-01-23 13:22:48 +0100 |
| commit | b47d2f8029df4d40f29ae5eaa313d883ca83bf70 (patch) | |
| tree | c0142fe19dbd1cb33c0fb57c3d0cbffe084c8390 | |
| parent | Merge pull request #12309 from zohl/chromiumos-kernel (diff) | |
| download | nixpkgs-b47d2f8029df4d40f29ae5eaa313d883ca83bf70.tar.gz | |
openjdk8: do not symlink icc profiles
| -rw-r--r-- | pkgs/development/compilers/openjdk/8.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index bbbae38f6b8e..45bef9819aab 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -141,6 +141,11 @@ let rm -rf $out/lib/openjdk/jre/bina ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin + # Make sure cmm/*.pf are not symlinks: + # https://youtrack.jetbrains.com/issue/IDEA-147272 + rm -rf $out/lib/openjdk/jre/lib/cmm + ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm + # Set PaX markings exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') echo "to mark: *$exes*" |