From c81571ca2d6c5754c208fc35da63d27bacd1bf74 Mon Sep 17 00:00:00 2001 From: niten Date: Sun, 29 May 2022 10:42:17 -0700 Subject: [PATCH] -T -> -X Also, switch to taking loaded deps. --- mkClojureLib.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mkClojureLib.nix b/mkClojureLib.nix index a74576c..440136a 100644 --- a/mkClojureLib.nix +++ b/mkClojureLib.nix @@ -18,8 +18,7 @@ let } ''; - deps = callPackage clj-deps { }; - classpath = deps.makeClasspaths { }; + classpath = clj-deps.makeClasspaths { }; full-name = "${group}-${name}-${version}-standalone.jar"; @@ -30,8 +29,8 @@ in stdenv.mkDerivation { src = src; - nativeBuildInputs = [ jre clojure ]; - buildInputs = (map (x: x.paths) deps.packages); + nativeBuildInputs = [ clojure ]; + buildInputs = (map (x: x.paths) clj-deps.packages); buildPhase = '' HOME=$TEMP/home @@ -41,7 +40,7 @@ in stdenv.mkDerivation { clojure \ -Scp ${classpath} \ -Sdeps ${build-tools-deps} \ - -T:build \ + -X:build \ lib-uberjar \ :project ${group}/${name} \ :version ${version}" \