Switch to mkClojureLib

2022-05-29 09:34:32 -07:00
parent a15b3b8494
commit 1a8238cf91
4 changed files with 154 additions and 12 deletions
@@ -19,7 +19,7 @@
    utils.lib.eachDefaultSystem (system:
      let
        pkgs = nixpkgs.legacyPackages."${system}";
-        clojure-build-tools = pkgs.callPackage ./build.tools.nix {
+        build-tools-jar = pkgs.callPackage ./build.tools.nix {
          inherit build-tools-src;
          inherit (gitignore.lib) gitignoreSource;
        };
@@ -27,17 +27,10 @@
          inherit build-tools-src;
          inherit clj2nix;
        };
+        mkClojureLib =
+          pkgs.callPackage ./mkClojureLib.nix { inherit build-tools-jar; };
      in {
-        packages = utils.lib.flattenTree { inherit clojure-build-tools; };
-        defaultPackage = self.packages."${system}".clojure-build-tools;
-        overlay = final: prev: { inherit clojure-build-tools; };
-        devShell = pkgs.mkShell {
-          buildInputs = with pkgs; [
-            clojure
-            jre
-            clj2nix.packages."${system}".clj2nix
-            update-deps
-          ];
-        };
+        packages = utils.lib.flattenTree { inherit mkClojureLib; };
+        overlay = final: prev: { inherit mkClojureLib; };
      });
 }