diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index f28cbcb83196..f5cce8daac55 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -17,7 +17,11 @@ let f = pkgs: prev: - if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then + if + !pkgs.stdenv.hostPlatform.isDarwin + || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" + || !(pkgs.stdenv ? __bootPackages) + then prev.darwin.sourceRelease else f pkgs.stdenv.__bootPackages pkgs; diff --git a/pkgs/os-specific/darwin/by-name/av/AvailabilityVersions/package.nix b/pkgs/os-specific/darwin/by-name/av/AvailabilityVersions/package.nix index d0aa908a3b83..dc23cff7e934 100644 --- a/pkgs/os-specific/darwin/by-name/av/AvailabilityVersions/package.nix +++ b/pkgs/os-specific/darwin/by-name/av/AvailabilityVersions/package.nix @@ -11,7 +11,11 @@ let inherit (buildPackages) gnused python3; f = pkgs: prev: - if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then + if + !pkgs.stdenv.hostPlatform.isDarwin + || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" + || !(pkgs.stdenv ? __bootPackages) + then prev.darwin.sourceRelease else f pkgs.stdenv.__bootPackages pkgs; diff --git a/pkgs/os-specific/darwin/by-name/bo/bootstrap_cmds/package.nix b/pkgs/os-specific/darwin/by-name/bo/bootstrap_cmds/package.nix index 3d267ef6ae5a..17b4b9f62118 100644 --- a/pkgs/os-specific/darwin/by-name/bo/bootstrap_cmds/package.nix +++ b/pkgs/os-specific/darwin/by-name/bo/bootstrap_cmds/package.nix @@ -14,7 +14,11 @@ let f = pkgs: prev: - if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then + if + !pkgs.stdenv.hostPlatform.isDarwin + || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" + || !(pkgs.stdenv ? __bootPackages) + then prev.darwin.sourceRelease else f pkgs.stdenv.__bootPackages pkgs; diff --git a/pkgs/os-specific/darwin/by-name/di/diskdev_cmds/package.nix b/pkgs/os-specific/darwin/by-name/di/diskdev_cmds/package.nix index d905e3617611..462bfcce9706 100644 --- a/pkgs/os-specific/darwin/by-name/di/diskdev_cmds/package.nix +++ b/pkgs/os-specific/darwin/by-name/di/diskdev_cmds/package.nix @@ -10,7 +10,11 @@ let f = pkgs: prev: - if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then + if + !pkgs.stdenv.hostPlatform.isDarwin + || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" + || !(pkgs.stdenv ? __bootPackages) + then prev.darwin.sourceRelease else f pkgs.stdenv.__bootPackages pkgs; diff --git a/pkgs/os-specific/darwin/by-name/do/doc_cmds/package.nix b/pkgs/os-specific/darwin/by-name/do/doc_cmds/package.nix index d26a1a9f4b13..614f670b10f9 100644 --- a/pkgs/os-specific/darwin/by-name/do/doc_cmds/package.nix +++ b/pkgs/os-specific/darwin/by-name/do/doc_cmds/package.nix @@ -11,7 +11,11 @@ let f = pkgs: prev: - if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then + if + !pkgs.stdenv.hostPlatform.isDarwin + || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" + || !(pkgs.stdenv ? __bootPackages) + then prev.darwin.sourceRelease else f pkgs.stdenv.__bootPackages pkgs; diff --git a/pkgs/os-specific/darwin/by-name/dy/dyld/package.nix b/pkgs/os-specific/darwin/by-name/dy/dyld/package.nix index 06c4aaedc5af..eda8c5d8df5a 100644 --- a/pkgs/os-specific/darwin/by-name/dy/dyld/package.nix +++ b/pkgs/os-specific/darwin/by-name/dy/dyld/package.nix @@ -22,7 +22,11 @@ let f = pkgs: prev: - if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then + if + !pkgs.stdenv.hostPlatform.isDarwin + || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" + || !(pkgs.stdenv ? __bootPackages) + then prev.darwin.sourceRelease else f pkgs.stdenv.__bootPackages pkgs; diff --git a/pkgs/os-specific/darwin/by-name/fi/file_cmds/package.nix b/pkgs/os-specific/darwin/by-name/fi/file_cmds/package.nix index 1e6433c31098..08498f2786a0 100644 --- a/pkgs/os-specific/darwin/by-name/fi/file_cmds/package.nix +++ b/pkgs/os-specific/darwin/by-name/fi/file_cmds/package.nix @@ -19,7 +19,11 @@ let f = pkgs: prev: - if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then + if + !pkgs.stdenv.hostPlatform.isDarwin + || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" + || !(pkgs.stdenv ? __bootPackages) + then prev.darwin.sourceRelease else f pkgs.stdenv.__bootPackages pkgs; diff --git a/pkgs/os-specific/darwin/by-name/io/IOKitTools/package.nix b/pkgs/os-specific/darwin/by-name/io/IOKitTools/package.nix index ea0ae1c12795..e13835513ed4 100644 --- a/pkgs/os-specific/darwin/by-name/io/IOKitTools/package.nix +++ b/pkgs/os-specific/darwin/by-name/io/IOKitTools/package.nix @@ -10,7 +10,11 @@ let f = pkgs: prev: - if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then + if + !pkgs.stdenv.hostPlatform.isDarwin + || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" + || !(pkgs.stdenv ? __bootPackages) + then prev.darwin.sourceRelease else f pkgs.stdenv.__bootPackages pkgs; diff --git a/pkgs/os-specific/darwin/by-name/po/PowerManagement/package.nix b/pkgs/os-specific/darwin/by-name/po/PowerManagement/package.nix index 6c3883ed969a..9c285b013760 100644 --- a/pkgs/os-specific/darwin/by-name/po/PowerManagement/package.nix +++ b/pkgs/os-specific/darwin/by-name/po/PowerManagement/package.nix @@ -7,7 +7,11 @@ let f = pkgs: prev: - if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then + if + !pkgs.stdenv.hostPlatform.isDarwin + || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" + || !(pkgs.stdenv ? __bootPackages) + then prev.darwin.sourceRelease else f pkgs.stdenv.__bootPackages pkgs; diff --git a/pkgs/os-specific/darwin/by-name/sh/shell_cmds/package.nix b/pkgs/os-specific/darwin/by-name/sh/shell_cmds/package.nix index ba35d58c481f..4fc44ef8dcfc 100644 --- a/pkgs/os-specific/darwin/by-name/sh/shell_cmds/package.nix +++ b/pkgs/os-specific/darwin/by-name/sh/shell_cmds/package.nix @@ -15,7 +15,11 @@ let f = pkgs: prev: - if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then + if + !pkgs.stdenv.hostPlatform.isDarwin + || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" + || !(pkgs.stdenv ? __bootPackages) + then prev.darwin.sourceRelease else f pkgs.stdenv.__bootPackages pkgs; diff --git a/pkgs/os-specific/darwin/by-name/te/text_cmds/package.nix b/pkgs/os-specific/darwin/by-name/te/text_cmds/package.nix index a8b44093a9a5..7a911463152d 100644 --- a/pkgs/os-specific/darwin/by-name/te/text_cmds/package.nix +++ b/pkgs/os-specific/darwin/by-name/te/text_cmds/package.nix @@ -18,7 +18,11 @@ let f = pkgs: prev: - if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then + if + !pkgs.stdenv.hostPlatform.isDarwin + || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" + || !(pkgs.stdenv ? __bootPackages) + then prev.darwin.sourceRelease else f pkgs.stdenv.__bootPackages pkgs; diff --git a/pkgs/os-specific/darwin/by-name/to/top/package.nix b/pkgs/os-specific/darwin/by-name/to/top/package.nix index ef7e6efe9d0e..69418a6d9b6c 100644 --- a/pkgs/os-specific/darwin/by-name/to/top/package.nix +++ b/pkgs/os-specific/darwin/by-name/to/top/package.nix @@ -9,7 +9,11 @@ let f = pkgs: prev: - if !pkgs.stdenv.hostPlatform.isDarwin || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" then + if + !pkgs.stdenv.hostPlatform.isDarwin + || pkgs.stdenv.name == "bootstrap-stage0-stdenv-darwin" + || !(pkgs.stdenv ? __bootPackages) + then prev.darwin.sourceRelease else f pkgs.stdenv.__bootPackages pkgs;