From f83b1e2125d7c92b30fc172c3c8547503fc63417 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Tue, 7 Nov 2023 15:59:37 +0300 Subject: [PATCH] pkgs: inherit foot and callPackage from pkgs --- pkgs/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/default.nix b/pkgs/default.nix index 860c283..06609dd 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -19,8 +19,10 @@ }; packages = let + inherit (pkgs) callPackage foot; + pins = import ../npins; - mkPackage = path: {__functor = self: self.override;} // (pkgs.callPackage path {inherit pins;}); + mkPackage = path: {__functor = self: self.override;} // (callPackage path {inherit pins;}); in { # packages that follow npins entries # they can be updated via npins @@ -32,11 +34,11 @@ # static packages # need manual intervention with each update - cloneit = pkgs.callPackage ./cloneit {}; - reposilite-bin = pkgs.callPackage ./reposilite-bin {}; + cloneit = callPackage ./cloneit {}; + reposilite-bin = callPackage ./reposilite-bin {}; # patched packages - foot-transparent = pkgs.foot.overrideAttrs (prev: { + foot-transparent = foot.overrideAttrs (prev: { patches = (prev.patches or []) ++ [