From 981754ba5ce433b872c71a901e7d1979b07415ab Mon Sep 17 00:00:00 2001 From: r-vdp Date: Wed, 13 Dec 2023 10:20:58 +0100 Subject: [PATCH] flake: allow specifying the lib argument to nixosSystem Some configs rely on being able to pass their own lib argument into nixosSystem, for instance in order to add their own additional overlay to nixpkgs.lib. This was broken by 039f73f134. --- flake.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index f16bc7d05fce..ff04e6b972d8 100644 --- a/flake.nix +++ b/flake.nix @@ -21,12 +21,13 @@ nixosSystem = args: import ./nixos/lib/eval-config.nix ( - args // { inherit (self) lib; } // lib.optionalAttrs (! args?system) { + { + lib = final; # Allow system to be set modularly in nixpkgs.system. # We set it to null, to remove the "legacy" entrypoint's # non-hermetic default. system = null; - } + } // args ); });