From f3e0f5e75559791066223997edfe45d76adf4bee Mon Sep 17 00:00:00 2001 From: lostdj Date: Thu, 11 Sep 2014 20:51:12 +0400 Subject: [PATCH] IntelliJ IDEA: do not assume that we are using OpenJDK. --- pkgs/applications/editors/idea/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index caa9523af6f6..c673ea672c7c 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -42,7 +42,9 @@ let mkdir -p $out/bin - jdk=${jdk}/lib/openjdk + [ -d ${jdk}/lib/openjdk ] \ + && jdk=${jdk}/lib/openjdk \ + || jdk=${jdk} makeWrapper $out/idea-$build/bin/idea.sh $out/bin/idea \ --prefix PATH : ${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin \