Skip to content

Commit

Permalink
nixos/top-level.nix: Remove workaround for NixOS#156533
Browse files Browse the repository at this point in the history
  • Loading branch information
roberth committed Nov 4, 2022
1 parent 0b05ed2 commit 37fa46a
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions nixos/modules/system/activation/top-level.nix
Original file line number Diff line number Diff line change
Expand Up @@ -125,16 +125,6 @@ let
pkgs.replaceDependency { inherit oldDependency newDependency drv; }
) baseSystemAssertWarn config.system.replaceRuntimeDependencies;

/* Workaround until https://github.com/NixOS/nixpkgs/pull/156533
Call can be replaced by argument when that's merged.
*/
tmpFixupSubmoduleBoundary = subopts:
lib.mkOption {
type = lib.types.submoduleWith {
modules = [ { options = subopts; } ];
};
};

in

{
Expand Down Expand Up @@ -173,7 +163,7 @@ in
'';
};

system.build = tmpFixupSubmoduleBoundary {
system.build = {
installBootLoader = mkOption {
internal = true;
# "; true" => make the `$out` argument from switch-to-configuration.pl
Expand Down

0 comments on commit 37fa46a

Please sign in to comment.