Skip to content

various: drop darwin workarounds for infrec #456131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wolfgangwalther wants to merge 1 commit into from
Closed

various: drop darwin workarounds for infrec #456131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions pkgs/development/libraries/libxml2/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
stdenv,
darwin,
lib,
pkg-config,
autoreconfHook,
Expand All @@ -27,12 +26,7 @@
freezeUpdateScript ? false,
}:

let
# libxml2 is a dependency of xcbuild. Avoid an infinite recursion by using a bootstrap stdenv
# that does not propagate xcrun.
stdenv' = if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv;
in
stdenv'.mkDerivation (finalAttrs: {
stdenv.mkDerivation (finalAttrs: {
inherit
version
src
Expand Down
22 changes: 3 additions & 19 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6913,12 +6913,6 @@ with pkgs;

watson-ruby = callPackage ../development/tools/misc/watson-ruby { };

xcbuild = callPackage ../by-name/xc/xcbuild/package.nix {
stdenv =
# xcbuild is included in the SDK. Avoid an infinite recursion by using a bootstrap stdenv.
if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv;
};

xcbuildHook = makeSetupHook {
name = "xcbuild-hook";
propagatedBuildInputs = [ xcbuild ];
Expand Down Expand Up @@ -7898,12 +7892,7 @@ with pkgs;
libpeas = callPackage ../development/libraries/libpeas { };
libpeas2 = callPackage ../development/libraries/libpeas/2.x.nix { };

libpng = callPackage ../development/libraries/libpng {
stdenv =
# libpng is a dependency of xcbuild. Avoid an infinite recursion by using a bootstrap stdenv
# that does not propagate xcrun.
if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv;
};
libpng = callPackage ../development/libraries/libpng { };

libpng12 = callPackage ../development/libraries/libpng/12.nix { };

Expand Down Expand Up @@ -8147,7 +8136,7 @@ with pkgs;
null
else
callPackage ../development/libraries/ncurses {
# ncurses is included in the SDK. Avoid an infinite recursion by using a bootstrap stdenv.
# ncurses is included in the SDK. Avoid an infinite recursion with `pkgsStatic` by using a bootstrap stdenv.
stdenv = if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv;
};

Expand Down Expand Up @@ -8776,12 +8765,7 @@ with pkgs;

xgboostWithCuda = xgboost.override { cudaSupport = true; };

zlib = callPackage ../development/libraries/zlib {
stdenv =
# zlib is a dependency of xcbuild. Avoid an infinite recursion by using a bootstrap stdenv
# that does not propagate xcrun.
if stdenv.hostPlatform.isDarwin then darwin.bootstrapStdenv else stdenv;
};
zlib = callPackage ../development/libraries/zlib { };

inherit
(rec {
Expand Down
Loading