diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-12-15 21:40:23 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-12-15 21:40:23 +0100 |
| commit | 24d81d6332bf95574367a1fab9c7b734e2807047 (patch) | |
| tree | 6b71810cf703d14dbfb74a62c4f4b3014d5ed450 /pkgs/development/interpreters | |
| parent | 774559a0ca9cc28d797e2ba912abdfb77895c77b (diff) | |
| parent | b256afac58b80adde2605eac434a04b9a23bbe95 (diff) | |
| download | nixlib-24d81d6332bf95574367a1fab9c7b734e2807047.tar nixlib-24d81d6332bf95574367a1fab9c7b734e2807047.tar.gz nixlib-24d81d6332bf95574367a1fab9c7b734e2807047.tar.bz2 nixlib-24d81d6332bf95574367a1fab9c7b734e2807047.tar.lz nixlib-24d81d6332bf95574367a1fab9c7b734e2807047.tar.xz nixlib-24d81d6332bf95574367a1fab9c7b734e2807047.tar.zst nixlib-24d81d6332bf95574367a1fab9c7b734e2807047.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/clojure/default.nix | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index ed2c4db20f7c..5aaa18e5ac68 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -1,23 +1,25 @@ -{ stdenv, fetchurl, unzip, ant, jdk, makeWrapper }: +{ stdenv, fetchurl, jdk, makeWrapper }: -let version = "1.8.0"; in +let version = "1.9.0.273"; in stdenv.mkDerivation { name = "clojure-${version}"; src = fetchurl { - url = "http://repo1.maven.org/maven2/org/clojure/clojure/${version}/clojure-${version}.zip"; - sha256 = "1nip095fz5c492sw15skril60i1vd21ibg6szin4jcvyy3xr6cym"; + url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; + sha256 = "0xmrq3xvr002jgq8m1j0y5ld0rcr49608g3gqxgyxzjqswacglb4"; }; - buildInputs = [ unzip ant jdk makeWrapper ]; - - buildPhase = "ant jar"; + buildInputs = [ jdk makeWrapper ]; installPhase = '' - mkdir -p $out/share/java $out/bin - install -t $out/share/java clojure.jar - makeWrapper ${jdk.jre}/bin/java $out/bin/clojure --add-flags "-cp $out/share/java/clojure.jar clojure.main" + 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 ''; meta = with stdenv.lib; { |