summary refs log tree commit diff
path: root/pkgs/applications/editors
diff options
context:
space:
mode:
authorEdward Tjörnhammar <ed@cflags.cc>2015-04-22 20:15:05 +0200
committerEdward Tjörnhammar <ed@cflags.cc>2015-04-22 20:15:05 +0200
commit63563b2c5fc21965769bf358187a26670cd54ec7 (patch)
treea8f092b80a3928cea5fbde0e54dec946c4d633df /pkgs/applications/editors
parenta039f4a58425456270b5f69b7c9d29bf6c6a4954 (diff)
downloadnixlib-63563b2c5fc21965769bf358187a26670cd54ec7.tar
nixlib-63563b2c5fc21965769bf358187a26670cd54ec7.tar.gz
nixlib-63563b2c5fc21965769bf358187a26670cd54ec7.tar.bz2
nixlib-63563b2c5fc21965769bf358187a26670cd54ec7.tar.lz
nixlib-63563b2c5fc21965769bf358187a26670cd54ec7.tar.xz
nixlib-63563b2c5fc21965769bf358187a26670cd54ec7.tar.zst
nixlib-63563b2c5fc21965769bf358187a26670cd54ec7.zip
ideas: correct env vars in wrapper
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r--pkgs/applications/editors/idea/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index cc21c171eb37..0f9df276569f 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -64,8 +64,10 @@ let
 
       makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
         --prefix PATH : "$out/libexec/${name}:${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \
-        --prefix JDK_HOME : "$jdk" \
-        --prefix ${hiName}_JDK : "$jdk"
+        --set JDK_HOME "$jdk" \
+        --set ${hiName}_JDK "$jdk" \
+        --set ANDROID_JAVA_HOME "$jdk" \
+        --set JAVA_HOME "$jdk"
 
       ln -s "$item/share/applications" $out/share
     '';