Skip to content

Commit

Permalink
fix test
Browse files Browse the repository at this point in the history
  • Loading branch information
David Arnold committed Apr 25, 2021
1 parent 7418d2c commit 4eb7af8
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions systemFlake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,13 @@ let
lib = selectedNixpkgs.lib;
# Use nixos modules from patched nixpkgs
baseModules = import (patchedChannel + "/nixos/modules/module-list.nix");
specialArgs = let
f = channelName:
{ "${channelName}ModulesPath" = builtins.toString (channels.${channelName}.input + "/nixos/modules"); };
in
specialArgs =
let
f = channelName:
{ "${channelName}ModulesPath" = builtins.toString (channels.${channelName}.input + "/nixos/modules"); };
in
# Add `<channelName>ModulesPath`s
(foldl' (lhs: rhs: lhs // rhs) {} (map f (attrNames channels)))
(foldl' (lhs: rhs: lhs // rhs) { } (map f (attrNames channels)))
# Override `modulesPath` because otherwise imports from there will not use patched nixpkgs
// { modulesPath = builtins.toString (patchedChannel + "/nixos/modules"); }
// host.specialArgs;
Expand Down Expand Up @@ -158,9 +159,9 @@ let
];
})
] ++ host.modules;
specialArgs = host.specialArgs;
inherit specialArgs;
} // (optionalAttrs (host.output == "nixosConfigurations") {
inherit lib baseModules specialArgs;
inherit lib baseModules;
}));
}
);
Expand Down

0 comments on commit 4eb7af8

Please sign in to comment.