about summary refs log tree commit diff
path: root/pkgs/applications/editors
diff options
context:
space:
mode:
authorRob Vermaas <rob.vermaas@gmail.com>2014-02-05 15:49:45 +0100
committerRob Vermaas <rob.vermaas@gmail.com>2014-02-05 15:49:45 +0100
commit6fe07cb3044f99861cafb05709fc094c403d5473 (patch)
tree6002492d8a5eb9a3ec8b7a3e86a106f597dd6807 /pkgs/applications/editors
parentd1d3e841b66b0834733f96a31bc577c73577d068 (diff)
downloadnixlib-6fe07cb3044f99861cafb05709fc094c403d5473.tar
nixlib-6fe07cb3044f99861cafb05709fc094c403d5473.tar.gz
nixlib-6fe07cb3044f99861cafb05709fc094c403d5473.tar.bz2
nixlib-6fe07cb3044f99861cafb05709fc094c403d5473.tar.lz
nixlib-6fe07cb3044f99861cafb05709fc094c403d5473.tar.xz
nixlib-6fe07cb3044f99861cafb05709fc094c403d5473.tar.zst
nixlib-6fe07cb3044f99861cafb05709fc094c403d5473.zip
Fix IDEA, previously it could not find the jdk.
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r--pkgs/applications/editors/idea/default.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 93e95c8d87d6..31812bcb9895 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -39,11 +39,14 @@ let
       7z a -tzip $out/$name/lib/snappy-java-1.0.5.jar .
 
       mkdir -p $out/bin
+
+      jdk=${jdk}/lib/openjdk
+
       makeWrapper $out/$name/bin/idea.sh $out/bin/idea \
         --prefix PATH : ${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin \
         --prefix LD_RUN_PATH : ${stdenv.gcc.gcc}/lib/ \
-        --prefix JDK_HOME : ${jdk} \
-        --prefix IDEA_JDK : ${jdk}
+        --prefix JDK_HOME : $jdk \
+        --prefix IDEA_JDK : $jdk
 
         mkdir -p $out/share/applications
         cp ${ideaItem}/share/applications/* $out/share/applications