Skip to content

Commit 4cf6b76

Browse files
authored
python3: disable static darwin builds (#395401)
2 parents 24a395a + 9484d4a commit 4cf6b76

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

pkgs/applications/version-management/git/default.nix

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,13 @@ stdenv.mkDerivation (finalAttrs: {
476476
+ lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
477477
disable_test t7527-builtin-fsmonitor
478478
''
479+
+
480+
lib.optionalString (stdenv.hostPlatform.isStatic && stdenv.hostPlatform.system == "x86_64-linux")
481+
''
482+
# https://github.com/NixOS/nixpkgs/pull/394957
483+
# > t2082-parallel-checkout-attributes.sh (Wstat: 256 (exited 1) Tests: 5 Failed: 1)
484+
disable_test t2082-parallel-checkout-attributes
485+
''
479486
+ lib.optionalString stdenv.hostPlatform.isMusl ''
480487
# Test fails (as of 2.17.0, musl 1.1.19)
481488
disable_test t3900-i18n-commit

pkgs/development/interpreters/python/cpython/default.nix

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,12 @@ stdenv.mkDerivation (finalAttrs: {
815815
platforms = platforms.linux ++ platforms.darwin ++ platforms.windows ++ platforms.freebsd;
816816
mainProgram = executable;
817817
maintainers = lib.teams.python.members;
818+
# static build on x86_64-darwin/aarch64-darwin breaks with:
819+
# configure: error: C compiler cannot create executables
820+
818821
# mingw patches only apply to Python 3.11 currently
819-
broken = (lib.versions.minor version) != "11" && stdenv.hostPlatform.isWindows;
822+
broken =
823+
(lib.versions.minor version != "11" && stdenv.hostPlatform.isWindows)
824+
|| (stdenv.hostPlatform.isStatic && stdenv.hostPlatform.isDarwin);
820825
};
821826
})

0 commit comments

Comments
 (0)