summary refs log tree commit diff
path: root/pkgs/development/tools/build-managers/leiningen/builder.sh
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/tools/build-managers/leiningen/builder.sh')
-rw-r--r--pkgs/development/tools/build-managers/leiningen/builder.sh13
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh
index 8d0924028cc..c28854ca089 100644
--- a/pkgs/development/tools/build-managers/leiningen/builder.sh
+++ b/pkgs/development/tools/build-managers/leiningen/builder.sh
@@ -1,16 +1,14 @@
 #!/bin/bash
 
-set -e
-
 source $stdenv/setup
 
-mkdir -pv $out/bin $out/lib
+mkdir -pv $out/bin $out/share/java
 
 out_bin=$out/bin/lein
 
 cp -v $src $out_bin
-cp -v $jarsrc $out/lib
-cp -v $clojure/lib/java/* $out/lib
+cp -v $jarsrc $out/share/java
+cp -v $clojure/share/java/* $out/share/java/
 
 for p in $patches;
 do
@@ -21,5 +19,6 @@ chmod -v 755 $out_bin
 patchShebangs $out
 
 wrapProgram $out_bin \
-    --prefix PATH ":" ${rlwrap}/bin \
-    --set LEIN_GPG ${gnupg}/bin/gpg
+    --prefix PATH ":" "${rlwrap}/bin:${coreutils}/bin:${findutils}/bin" \
+    --set LEIN_GPG ${gnupg}/bin/gpg \
+    --set JAVA_CMD ${jdk}/bin/java