summary refs log tree commit diff
path: root/pkgs/development/interpreters
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-02-19 15:24:13 +0100
committerVladimír Čunát <vcunat@gmail.com>2018-02-19 15:24:13 +0100
commit0c8939b5fbb276be0cbf00b6f6bfcbc56806164b (patch)
tree1b260e3a59ca673474580c466274f3b7ca388415 /pkgs/development/interpreters
parent9cad2a4f4a2de889d20db1eafdb5c7ac552e707b (diff)
parent9b662759053eabe0ccea199b00859243593151f1 (diff)
downloadnixpkgs-0c8939b5fbb276be0cbf00b6f6bfcbc56806164b.tar
nixpkgs-0c8939b5fbb276be0cbf00b6f6bfcbc56806164b.tar.gz
nixpkgs-0c8939b5fbb276be0cbf00b6f6bfcbc56806164b.tar.bz2
nixpkgs-0c8939b5fbb276be0cbf00b6f6bfcbc56806164b.tar.lz
nixpkgs-0c8939b5fbb276be0cbf00b6f6bfcbc56806164b.tar.xz
nixpkgs-0c8939b5fbb276be0cbf00b6f6bfcbc56806164b.tar.zst
nixpkgs-0c8939b5fbb276be0cbf00b6f6bfcbc56806164b.zip
Merge branch 'master' into gcc-7
Hydra: ?compare=1434487
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r--pkgs/development/interpreters/clojure/default.nix28
1 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index 3b071d3afb3..7aac606fdfb 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -1,28 +1,28 @@
 { stdenv, fetchurl, jdk, rlwrap, makeWrapper }:
 
-let version = "1.9.0.326"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "clojure-${version}";
+  version = "1.9.0.329";
 
   src = fetchurl {
     url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
-    sha256 = "0sf8gy39iz4jxj2wic1lbdwdwbj90k3awhr0kq76gr1z1dwbj6s9";
+    sha256 = "1g1mi75285z977vrqbihmmmrmdcnznxbw3r6wkzh571sc1yyrlrj";
   };
 
   buildInputs = [ makeWrapper ];
 
+  outputs = [ "out" "prefix" ];
+
   installPhase = ''
-    pwd
-    ls -la
-    mkdir -p $out/libexec $out/bin
-    cp -f deps.edn example-deps.edn $out
-    cp -f clojure-tools-${version}.jar $out/libexec
-    sed -i -e "s@PREFIX@$out@g" clojure
-    cp -f clj clojure $out/bin
-    for program in $out/bin/{clojure,clj}; do
-      wrapProgram $program --suffix PATH : $out/bin:${jdk.jre}/bin:${rlwrap}/bin
-    done
+    mkdir -p $prefix/libexec
+    cp clojure-tools-${version}.jar $prefix/libexec
+    cp {,example-}deps.edn $prefix
+
+    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
   '';
 
   meta = with stdenv.lib; {