From be649496884f1a9242b3989f365d73c16eabfeba Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Fri, 7 Mar 2014 13:32:10 +0100 Subject: [PATCH] leiningen: Hardcode path to java. ...by setting JAVA_CMD in the wrapper. --- pkgs/development/tools/build-managers/leiningen/builder.sh | 3 ++- pkgs/development/tools/build-managers/leiningen/default.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh index e1dd9d5a786..c28854ca089 100644 --- a/pkgs/development/tools/build-managers/leiningen/builder.sh +++ b/pkgs/development/tools/build-managers/leiningen/builder.sh @@ -20,4 +20,5 @@ patchShebangs $out wrapProgram $out_bin \ --prefix PATH ":" "${rlwrap}/bin:${coreutils}/bin:${findutils}/bin" \ - --set LEIN_GPG ${gnupg}/bin/gpg + --set LEIN_GPG ${gnupg}/bin/gpg \ + --set JAVA_CMD ${jdk}/bin/java diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 2c039b3fa0c..ff21e518936 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patches = ./lein_2.3.0.patch; - inherit rlwrap clojure gnupg findutils coreutils; + inherit rlwrap clojure gnupg findutils coreutils jdk; builder = ./builder.sh;