From 007447652b387fa32fad9129db58809d4f534c4d Mon Sep 17 00:00:00 2001 From: David Arnold Date: Thu, 18 Mar 2021 15:58:01 -0500 Subject: [PATCH] iso: add back complete host profile to the nix store This ensures that all builds of activated profiles are included into the iso cache and don't require rebuilding within the live installer environment. --- lib/devos/devosSystem.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/devos/devosSystem.nix b/lib/devos/devosSystem.nix index be9de4f..832cdb4 100644 --- a/lib/devos/devosSystem.nix +++ b/lib/devos/devosSystem.nix @@ -7,6 +7,8 @@ lib.nixosSystem (args // { moduleList = builtins.attrValues modules; modpath = "nixos/modules"; + fullHostConfig = (lib.nixosSystem (args // { modules = moduleList; })).config; + isoConfig = (lib.nixosSystem (args // { modules = moduleList ++ [ @@ -27,6 +29,9 @@ lib.nixosSystem (args // { }]; isoImage.storeContents = [ self.devShell.${config.nixpkgs.system} + # include also closures that are "switched off" by the + # above profile filter on the local config attribute + fullHostConfig.system.build.toplevel ]; # confilcts with networking.wireless which might be slightly