about summary refs log tree commit diff
path: root/pkgs/development/interpreters
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2018-07-17 10:25:11 +0800
committeradisbladis <adisbladis@gmail.com>2018-07-17 10:25:34 +0800
commitd1eaa5b6510661b6a3a622eb25b4fc044febe3a8 (patch)
tree84660fb444d053d39b915b7665278d5cf3e44938 /pkgs/development/interpreters
parent8258f5bda435c7a9ea771cb530c7c2367beabf11 (diff)
downloadnixlib-d1eaa5b6510661b6a3a622eb25b4fc044febe3a8.tar
nixlib-d1eaa5b6510661b6a3a622eb25b4fc044febe3a8.tar.gz
nixlib-d1eaa5b6510661b6a3a622eb25b4fc044febe3a8.tar.bz2
nixlib-d1eaa5b6510661b6a3a622eb25b4fc044febe3a8.tar.lz
nixlib-d1eaa5b6510661b6a3a622eb25b4fc044febe3a8.tar.xz
nixlib-d1eaa5b6510661b6a3a622eb25b4fc044febe3a8.tar.zst
nixlib-d1eaa5b6510661b6a3a622eb25b4fc044febe3a8.zip
clojure: Fix bin wrappers
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r--pkgs/development/interpreters/clojure/default.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index 4843653e5dc2..4ea149d1137d 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "prefix" ];
 
-  installPhase = ''
+  installPhase = let
+    binPath = stdenv.lib.makeBinPath [ rlwrap jdk ];
+  in ''
     mkdir -p $prefix/libexec
     cp clojure-tools-${version}.jar $prefix/libexec
     cp {,example-}deps.edn $prefix
@@ -21,8 +23,8 @@ stdenv.mkDerivation rec {
     substituteInPlace clojure --replace PREFIX $prefix
 
     install -Dt $out/bin clj clojure
-    wrapProgram $out/bin/clj --suffix PATH ${rlwrap}/bin
-    wrapProgram $out/bin/clojure --suffix PATH ${jdk}/bin
+    wrapProgram $out/bin/clj --prefix PATH : ${binPath}
+    wrapProgram $out/bin/clojure --prefix PATH : ${binPath}
   '';
 
   meta = with stdenv.lib; {