diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-01-01 15:49:20 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-01-07 14:55:41 -0800 |
| commit | c82410eeda78deb3afe898168700772d53361985 (patch) | |
| tree | 1f7be826db3a134ad4fa765077fcdc93bab98d9f /pkgs/applications/editors | |
| parent | bbc4262514107fd6658696ddebfeba7071ac17b1 (diff) | |
| download | nixlib-c82410eeda78deb3afe898168700772d53361985.tar nixlib-c82410eeda78deb3afe898168700772d53361985.tar.gz nixlib-c82410eeda78deb3afe898168700772d53361985.tar.bz2 nixlib-c82410eeda78deb3afe898168700772d53361985.tar.lz nixlib-c82410eeda78deb3afe898168700772d53361985.tar.xz nixlib-c82410eeda78deb3afe898168700772d53361985.tar.zst nixlib-c82410eeda78deb3afe898168700772d53361985.zip | |
java: Normalize to the default jre / jdk
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/idea/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/editors/jedit/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/editors/netbeans/default.nix | 4 |
3 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index afa1c5682a8e..e53292451d32 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -70,9 +70,7 @@ let cp -va . "$out/$name" ln -s "$out/$name/bin/${loName}.png" "$out/share/pixmaps/" - [ -d ${jdk}/lib/openjdk ] \ - && jdk=${jdk}/lib/openjdk \ - || jdk=${jdk} + jdk=${jdk.home} makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${loName}" \ --prefix PATH : "${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \ diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix index 0e11c577fc85..b19723177046 100644 --- a/pkgs/applications/editors/jedit/default.nix +++ b/pkgs/applications/editors/jedit/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { patch package-files/linux/jedit << EOF 5a6,8 > # specify the correct JAVA_HOME - > JAVA_HOME=${jdk.jre}/lib/openjdk/jre + > JAVA_HOME=${jdk.jre.home}/jre > EOF sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 5a2afebdd5cf..79dbb589d236 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation { mkdir -p $out/bin makeWrapper $out/netbeans/bin/netbeans $out/bin/netbeans \ --prefix PATH : ${jdk}/bin:${which}/bin \ - --prefix JAVA_HOME : ${jdk}/lib/openjdk \ - --add-flags "--jdkhome ${jdk}/lib/openjdk" + --prefix JAVA_HOME : ${jdk.home} \ + --add-flags "--jdkhome ${jdk.home}" # Create desktop item, so we can pick it from the KDE/GNOME menu mkdir -p $out/share/applications |