diff options
Diffstat (limited to 'pkgs/stdenv/darwin/override-sdk.nix')
-rw-r--r-- | pkgs/stdenv/darwin/override-sdk.nix | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/stdenv/darwin/override-sdk.nix b/pkgs/stdenv/darwin/override-sdk.nix index 6de67537b4990..d24c118cc6685 100644 --- a/pkgs/stdenv/darwin/override-sdk.nix +++ b/pkgs/stdenv/darwin/override-sdk.nix @@ -287,6 +287,7 @@ let replacements = lib.pipe propagatedInputs [ (lib.filter (pkg: pkg != null)) + lib.flatten (map (dep: { name = builtins.unsafeDiscardStringContext dep; value = getReplacement newPackages dep; @@ -311,6 +312,7 @@ let let mapPackageDeps = lib.flip lib.pipe [ (lib.filter (pkg: pkg != null)) + lib.flatten (map (pkg: { key = builtins.unsafeDiscardStringContext pkg; package = pkg; @@ -403,13 +405,13 @@ let stdenv.override ( old: { - buildPlatform = mkPlatform newVersion old.buildPlatform; - hostPlatform = mkPlatform newVersion old.hostPlatform; - targetPlatform = mkPlatform newVersion old.targetPlatform; + buildPlatform = mkPlatform newVersion stdenv.buildPlatform; + hostPlatform = mkPlatform newVersion stdenv.hostPlatform; + targetPlatform = mkPlatform newVersion stdenv.targetPlatform; } # Only perform replacements if the SDK version has changed. Changing only the # deployment target does not require replacing the libc or SDK dependencies. - // lib.optionalAttrs (old.hostPlatform.darwinSdkVersion != darwinSdkVersion) { + // lib.optionalAttrs (stdenv.hostPlatform.darwinSdkVersion != darwinSdkVersion) { allowedRequisites = null; mkDerivationFromStdenv = extendMkDerivationArgs old (mapInputsToSDK [ |