summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorGabriel Ebner <gebner@gebner.org>2016-01-23 09:54:07 +0100
committerGabriel Ebner <gebner@gebner.org>2016-01-23 13:22:48 +0100
commitb47d2f8029df4d40f29ae5eaa313d883ca83bf70 (patch)
treec0142fe19dbd1cb33c0fb57c3d0cbffe084c8390 /pkgs
parent29785c5b7a6285bccf13ae0e0895c79b1497265e (diff)
downloadnixpkgs-b47d2f8029df4d40f29ae5eaa313d883ca83bf70.tar
nixpkgs-b47d2f8029df4d40f29ae5eaa313d883ca83bf70.tar.gz
nixpkgs-b47d2f8029df4d40f29ae5eaa313d883ca83bf70.tar.bz2
nixpkgs-b47d2f8029df4d40f29ae5eaa313d883ca83bf70.tar.lz
nixpkgs-b47d2f8029df4d40f29ae5eaa313d883ca83bf70.tar.xz
nixpkgs-b47d2f8029df4d40f29ae5eaa313d883ca83bf70.tar.zst
nixpkgs-b47d2f8029df4d40f29ae5eaa313d883ca83bf70.zip
openjdk8: do not symlink icc profiles
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/compilers/openjdk/8.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index bbbae38f6b8..45bef9819aa 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*"