summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorEdward Tjörnhammar <ed@cflags.cc>2016-01-24 10:29:54 +0100
committerEdward Tjörnhammar <ed@cflags.cc>2016-01-24 10:29:54 +0100
commite8cc9204a85a871e35014f578536a362fcd1c682 (patch)
tree4e5df745640b4d853ef54970a0569c783eaa6530 /pkgs/development
parentc485ba1c661dc5f6f71cefec2a489e8cbe7435c8 (diff)
parenta8d6ad8690e22bc1961c4efce4b8cdb534077606 (diff)
downloadnixpkgs-e8cc9204a85a871e35014f578536a362fcd1c682.tar
nixpkgs-e8cc9204a85a871e35014f578536a362fcd1c682.tar.gz
nixpkgs-e8cc9204a85a871e35014f578536a362fcd1c682.tar.bz2
nixpkgs-e8cc9204a85a871e35014f578536a362fcd1c682.tar.lz
nixpkgs-e8cc9204a85a871e35014f578536a362fcd1c682.tar.xz
nixpkgs-e8cc9204a85a871e35014f578536a362fcd1c682.tar.zst
nixpkgs-e8cc9204a85a871e35014f578536a362fcd1c682.zip
Merge pull request #12568 from gebner/idea-openjdk8
idea: fix problems with openjdk8
Diffstat (limited to 'pkgs/development')
-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*"