From 64220f3f09d0f1e497f4f044220593e17fdd480c Mon Sep 17 00:00:00 2001 From: niten Date: Sun, 29 May 2022 09:45:16 -0700 Subject: [PATCH] Updated --- build-uberjar.sh | 6 ------ mkClojureLib.nix | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 build-uberjar.sh diff --git a/build-uberjar.sh b/build-uberjar.sh deleted file mode 100644 index a2a79ff..0000000 --- a/build-uberjar.sh +++ /dev/null @@ -1,6 +0,0 @@ -TARGET=$1 -CLASSPATH=$2 - -HOME=$TARGET/home -mkdir -p $HOME -clojure -Scp $CLASSPATH -Sdeps ${FIXME} -T:build lib-uberjar :project $PROJECT :target $TARGET :version $VERSION diff --git a/mkClojureLib.nix b/mkClojureLib.nix index bd28956..90134b8 100644 --- a/mkClojureLib.nix +++ b/mkClojureLib.nix @@ -1,5 +1,5 @@ -{ lib, mkDerivation, callPackage, jre, ruby, clojure, build-tools-jar -, writeScript, writeText, readFile, ... }: +{ lib, stdenv, callPackage, jre, ruby, clojure, build-tools-jar, writeScript +, writeText, ... }: { src, name, group, version, clj-deps, src-paths, ... }: with lib; @@ -30,7 +30,7 @@ let target = "$TEMP/target"; -in mkDerivation { +in stdenv.mkDerivation { name = name; src = src;