gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/nixpkgs.nix: Fix assertion when nixpkgs.pkgs is set

Browse Source
This commit is contained in:
Robert Hensing
2022-10-27 13:41:01 +02:00
parent bc4ce318bf
commit 5d663a9171
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/misc/nixpkgs.nix
View File

@@ -358,7 +358,7 @@ in
else "nixpkgs.localSystem"; else "nixpkgs.localSystem";
pkgsSystem = finalPkgs.stdenv.targetPlatform.system; pkgsSystem = finalPkgs.stdenv.targetPlatform.system;
in { in {
assertion = !hasPlatform -> nixosExpectedSystem == pkgsSystem; assertion = constructedByMe -> !hasPlatform -> nixosExpectedSystem == pkgsSystem;
message = "The NixOS nixpkgs.pkgs option was set to a Nixpkgs invocation that compiles to target system ${pkgsSystem} but NixOS was configured for system ${nixosExpectedSystem} via NixOS option ${nixosOption}. The NixOS system settings must match the Nixpkgs target system."; message = "The NixOS nixpkgs.pkgs option was set to a Nixpkgs invocation that compiles to target system ${pkgsSystem} but NixOS was configured for system ${nixosExpectedSystem} via NixOS option ${nixosOption}. The NixOS system settings must match the Nixpkgs target system.";
} }
) )