nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 13:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

stdenv: Use lib.systems.equals to compare systems (#567846)

Browse Source
This commit is contained in:
Winter
2026-09-28 12:08:51 +00:00
committed by GitHub
parent 53d7456928 abae62cff7
commit da597dd611
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/stdenv/booter.nix
View File

@@ -118,16 +118,16 @@ let
pkgsBuildBuild = prevStage.buildPackages;
pkgsBuildHost = prevStage;
pkgsBuildTarget =
if args.stdenv.targetPlatform == args.stdenv.hostPlatform then
if lib.systems.equals args.stdenv.targetPlatform args.stdenv.hostPlatform then
pkgsBuildHost
else
assert args.stdenv.hostPlatform == args.stdenv.buildPlatform;
assert lib.systems.equals args.stdenv.hostPlatform args.stdenv.buildPlatform;
thisStage;
pkgsHostHost =
if args.stdenv.hostPlatform == args.stdenv.targetPlatform then
if lib.systems.equals args.stdenv.hostPlatform args.stdenv.targetPlatform then
thisStage
else
assert args.stdenv.buildPlatform == args.stdenv.hostPlatform;
assert lib.systems.equals args.stdenv.buildPlatform args.stdenv.hostPlatform;
pkgsBuildHost;
pkgsTargetTarget = nextStage;
};

2
pkgs/stdenv/default.nix
View File

@@ -16,7 +16,7 @@
}:
let
useCrossStdenv = crossSystem != localSystem || crossOverlays != [ ];
useCrossStdenv = !(lib.systems.equals crossSystem localSystem) || crossOverlays != [ ];
useCustomStdenv = !useCrossStdenv && (config.replaceStdenv or null) != null;
# Cross and custom stdenvs extend the local bootstrap stages. Keep