swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

nixos/top-level.nix: Remove workaround for #156533

Browse source
This commit is contained in:
Robert Hensing 2022-11-04 23:59:15 +01:00
parent 0b05ed2c78
commit 37fa46a224
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
nixos/modules/system/activation/top-level.nix
View file

@ -125,16 +125,6 @@ let
pkgs.replaceDependency { inherit oldDependency newDependency drv; } pkgs.replaceDependency { inherit oldDependency newDependency drv; }
) baseSystemAssertWarn config.system.replaceRuntimeDependencies; ) 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 in
{ {
@ -173,7 +163,7 @@ in
''; '';
}; };
system.build = tmpFixupSubmoduleBoundary { system.build = {
installBootLoader = mkOption { installBootLoader = mkOption {
internal = true; internal = true;
# "; true" => make the `$out` argument from switch-to-configuration.pl # "; true" => make the `$out` argument from switch-to-configuration.pl