diff options
| author | Edward Tjörnhammar <ed@cflags.cc> | 2016-01-24 10:29:54 +0100 |
|---|---|---|
| committer | Edward Tjörnhammar <ed@cflags.cc> | 2016-01-24 10:29:54 +0100 |
| commit | e8cc9204a85a871e35014f578536a362fcd1c682 (patch) | |
| tree | 4e5df745640b4d853ef54970a0569c783eaa6530 /pkgs | |
| parent | c485ba1c661dc5f6f71cefec2a489e8cbe7435c8 (diff) | |
| parent | a8d6ad8690e22bc1961c4efce4b8cdb534077606 (diff) | |
| download | nixpkgs-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')
| -rw-r--r-- | pkgs/applications/editors/idea/common.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/editors/idea/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/development/compilers/openjdk/8.nix | 5 |
3 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/applications/editors/idea/common.nix b/pkgs/applications/editors/idea/common.nix index 96689fa75ad..36f600c1486 100644 --- a/pkgs/applications/editors/idea/common.nix +++ b/pkgs/applications/editors/idea/common.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip -, coreutils, gnugrep, which, git, python, unzip, androidsdk }: +, coreutils, gnugrep, which, git, python, unzip, jdk }: -{ name, product, version, build, src, meta, jdk } @ attrs: +{ name, product, version, build, src, meta } @ attrs: with stdenv.lib; diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 1f1dee8d197..acc3a75cca1 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf , coreutils, gnugrep, which, git, python, unzip, p7zip -, androidsdk, jdk, oraclejdk8 +, androidsdk, jdk }: assert stdenv.isLinux; @@ -8,12 +8,7 @@ assert stdenv.isLinux; let bnumber = with stdenv.lib; build: last (splitString "-" build); - mkIdeaProduct' = callPackage ./common.nix { }; - mkIdeaProduct = attrs: mkIdeaProduct' ({ - # After IDEA 15 we can no longer use OpenJDK. - # https://youtrack.jetbrains.com/issue/IDEA-147272 - jdk = if (bnumber attrs.build) < "143" then jdk else oraclejdk8; - } // attrs); + mkIdeaProduct = callPackage ./common.nix { }; buildAndroidStudio = { name, version, build, src, license, description }: let drv = (mkIdeaProduct rec { 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*" |