diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-08-08 12:43:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-08 12:43:32 +0200 |
| commit | b2445a1898327407e939c33639d70fb6934229d1 (patch) | |
| tree | c1381521a377299c128c0706b345bca39a762be5 /pkgs/development/interpreters | |
| parent | e91d8ff7ec61a4d87fac8d4da918baeeb70220db (diff) | |
| parent | 74f86bdb64ec8836f091500ccf26057930521c55 (diff) | |
Merge pull request #132922 from jlesquembre/clj
clojure: 1.10.3.933 expects tools.edn
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/clojure/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 77ec74e8c3f5..3fca18f65a6e 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { echo "Installing libs into $clojure_lib_dir" install -Dm644 deps.edn "$clojure_lib_dir/deps.edn" install -Dm644 example-deps.edn "$clojure_lib_dir/example-deps.edn" + install -Dm644 tools.edn "$clojure_lib_dir/tools.edn" install -Dm644 exec.jar "$clojure_lib_dir/libexec/exec.jar" install -Dm644 clojure-tools-${version}.jar "$clojure_lib_dir/libexec/clojure-tools-${version}.jar" @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckPhase = '' - CLJ_CONFIG=$out CLJ_CACHE=$out/libexec $out/bin/clojure \ + CLJ_CONFIG=$TMPDIR CLJ_CACHE=$TMPDIR/.clj_cache $out/bin/clojure \ -Spath \ -Sverbose \ -Scp $out/libexec/clojure-tools-${version}.jar |