Also, switch to taking loaded deps.
This commit is contained in:
niten 2022-05-29 10:42:17 -07:00
parent 2b9d712a71
commit c81571ca2d
1 changed files with 4 additions and 5 deletions

View File

@ -18,8 +18,7 @@ let
} }
''; '';
deps = callPackage clj-deps { }; classpath = clj-deps.makeClasspaths { };
classpath = deps.makeClasspaths { };
full-name = "${group}-${name}-${version}-standalone.jar"; full-name = "${group}-${name}-${version}-standalone.jar";
@ -30,8 +29,8 @@ in stdenv.mkDerivation {
src = src; src = src;
nativeBuildInputs = [ jre clojure ]; nativeBuildInputs = [ clojure ];
buildInputs = (map (x: x.paths) deps.packages); buildInputs = (map (x: x.paths) clj-deps.packages);
buildPhase = '' buildPhase = ''
HOME=$TEMP/home HOME=$TEMP/home
@ -41,7 +40,7 @@ in stdenv.mkDerivation {
clojure \ clojure \
-Scp ${classpath} \ -Scp ${classpath} \
-Sdeps ${build-tools-deps} \ -Sdeps ${build-tools-deps} \
-T:build \ -X:build \
lib-uberjar \ lib-uberjar \
:project ${group}/${name} \ :project ${group}/${name} \
:version ${version}" \ :version ${version}" \