From 399cde0558f149734a2e68e892049ed0ef74ceed Mon Sep 17 00:00:00 2001 From: niten Date: Sun, 29 May 2022 10:04:07 -0700 Subject: [PATCH] Tweaks --- flake.nix | 11 +++++++---- mkClojureLib.nix | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index d7c1fc0..1993f03 100644 --- a/flake.nix +++ b/flake.nix @@ -27,10 +27,13 @@ inherit build-tools-src; inherit clj2nix; }; - mkClojureLib = - pkgs.callPackage ./mkClojureLib.nix { inherit build-tools-jar; }; in { - packages = utils.lib.flattenTree { inherit mkClojureLib; }; - overlay = final: prev: { inherit mkClojureLib; }; + packages = utils.lib.flattenTree { + mkClojureLib = + pkgs.callPackage ./mkClojureLib.nix { inherit build-tools-jar; }; + }; + overlay = final: prev: { + inherit (self.packages.${system}) mkClojureLib; + }; }); } diff --git a/mkClojureLib.nix b/mkClojureLib.nix index 90134b8..5adcf86 100644 --- a/mkClojureLib.nix +++ b/mkClojureLib.nix @@ -1,6 +1,6 @@ { lib, stdenv, callPackage, jre, ruby, clojure, build-tools-jar, writeScript -, writeText, ... }: -{ src, name, group, version, clj-deps, src-paths, ... }: +, writeText }: +{ src, name, group, version, clj-deps, src-paths }: with lib; let