Try reverting to 0.6.8 again
This commit is contained in:
+20
-12
@@ -1,19 +1,21 @@
|
||||
{ lib, stdenv, callPackage, clojure, jre, writeTextDir, writeShellScript, toEDN
|
||||
{ lib, stdenv, callPackage, clojure, jre, writeText, writeShellScript, toEDN }:
|
||||
{ src, name, group, version, deps-edn, clj-deps, src-paths, build-tools-jar, ...
|
||||
}:
|
||||
{ src, name, group, version, clj-deps, src-paths, build-tools-jar, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
build-tools-deps = writeTextDir "deps.edn" (toEDN {
|
||||
build-tools-deps = toEDN {
|
||||
aliases.build = {
|
||||
ns-default = "'build";
|
||||
extra-deps."'io.github.clojure/tools.build"."local/root" =
|
||||
"${build-tools-jar}";
|
||||
''\"${build-tools-jar}\"'';
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
classpath = clj-deps.makeClasspaths { };
|
||||
|
||||
build-deps = callPackage ./deps.nix { };
|
||||
build-classpath = build-deps.makeClasspaths { };
|
||||
|
||||
full-name = "${name}-${version}-standalone.jar";
|
||||
|
||||
target = "$TEMP/target";
|
||||
@@ -24,25 +26,31 @@ let
|
||||
mkdir -p ${target}
|
||||
|
||||
clojure \
|
||||
-Scp .:${build-tools-jar}:${classpath} \
|
||||
-Sdeps ${build-tools-deps} \
|
||||
-Scp ${build-classpath}:${classpath}:${build-tools-jar}:. \
|
||||
-Sdeps "${build-tools-deps}" \
|
||||
-X:build \
|
||||
lib-uberjar \
|
||||
build/lib-uberjar \
|
||||
:project ${group}/${name} \
|
||||
:version ${version} \
|
||||
:src-dirs ${concatStringsSep "," src-paths} \
|
||||
:target ${target}
|
||||
:target '"${target}"' \
|
||||
:deps-edn '"${deps-edn}"'
|
||||
|
||||
[ $? -eq 0 ] || cat /tmp/*.edn
|
||||
'';
|
||||
|
||||
pthru = o: builtins.trace o o;
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = full-name;
|
||||
|
||||
src = src;
|
||||
|
||||
nativeBuildInputs = [ clojure jre ];
|
||||
buildInputs = (map (x: x.paths) clj-deps.packages);
|
||||
buildInputs = (map (x: x.paths) clj-deps.packages)
|
||||
++ (map (x: x.paths) build-deps.packages);
|
||||
|
||||
buildPhase = "${build-script}";
|
||||
buildPhase = pthru "${build-script}";
|
||||
|
||||
installPhase = ''
|
||||
mv ${target}/${name}-${version}-standalone.jar $out
|
||||
|
||||
Reference in New Issue
Block a user