mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 11:45:45 +03:00
Revert "nixos/nixpkgs: make config.nixpkgs.{localSystem,crossSystem,buildPlatform,hostPlatform} write only"
This reverts commit 0a19371146
.
This commit is contained in:
parent
692a57e61d
commit
0b47fba230
6 changed files with 46 additions and 37 deletions
|
@ -506,12 +506,8 @@ in
|
|||
config = {
|
||||
nixpkgs =
|
||||
if options.nixpkgs?hostPlatform
|
||||
then {
|
||||
hostPlatform =
|
||||
if host.options.nixpkgs.hostPlatform.isDefined
|
||||
then host.config.nixpkgs.hostPlatform
|
||||
else lib.defaultTo host.config.nixpkgs.localSystem host.config.nixpkgs.crossSystem;
|
||||
} else { localSystem = lib.defaultTo host.config.nixpkgs.localSystem host.config.nixpkgs.crossSystem; }
|
||||
then { inherit (host.pkgs.stdenv) hostPlatform; }
|
||||
else { localSystem = host.pkgs.stdenv.hostPlatform; }
|
||||
;
|
||||
boot.isContainer = true;
|
||||
networking.hostName = mkDefault name;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue