From 4b712be626b2ab80d95484d3e045bb42ada02170 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Sun, 22 Sep 2019 14:22:42 +0200 Subject: [PATCH] Ignore local config.nix and overlays --- src/pinned-pkgs.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/pinned-pkgs.nix b/src/pinned-pkgs.nix index d594a14..f739345 100644 --- a/src/pinned-pkgs.nix +++ b/src/pinned-pkgs.nix @@ -12,7 +12,12 @@ let sha256 = "0293j9wib78n5nspywrmd9qkvcqq2vcrclrryxqnaxvj3bs1c0vj"; }; - buildPkgs = import pinnedPkgs { }; + defaultNixpkgsArgs = { + config = { }; + overlays = [ ]; + }; + + buildPkgs = import pinnedPkgs defaultNixpkgsArgs; overlayJpegNoStatic = self: super: { inherit (buildPkgs) libjpeg; @@ -29,14 +34,14 @@ in { inherit buildPkgs; - crossPkgs = import pinnedPkgs { inherit crossSystem; }; + crossPkgs = import pinnedPkgs ({ inherit crossSystem; } // defaultNixpkgsArgs); - crossStaticPkgs = import pinnedPkgs { + crossStaticPkgs = import pinnedPkgs ({ inherit crossSystem; crossOverlays = [ (import "${pinnedPkgs}/pkgs/top-level/static.nix") overlayJpegNoStatic ]; - }; + } // defaultNixpkgsArgs); }