gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot]
2025-01-13 18:05:19 +00:00
committed by GitHub
parent bfd161e6f1 c67c39eb74
commit f9082802a1
112 changed files with 2325 additions and 907 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/python/cpython/default.nix
+4
View File
@@ -434,6 +434,8 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
'' + optionalString (stdenv.hostPlatform.isDarwin && x11Support && pythonAtLeast "3.11") ''
export TCLTK_LIBS="-L${tcl}/lib -L${tk}/lib -l${tcl.libPrefix} -l${tk.libPrefix}"
export TCLTK_CFLAGS="-I${tcl}/include -I${tk}/include"
'' + optionalString stdenv.hostPlatform.isWindows ''
export NIX_CFLAGS_COMPILE+=" -Wno-error=incompatible-pointer-types"
'' + optionalString stdenv.hostPlatform.isMusl ''
export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000"
'' +
@@ -665,5 +667,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
platforms = platforms.linux ++ platforms.darwin ++ platforms.windows ++ platforms.freebsd;
mainProgram = executable;
maintainers = lib.teams.python.members;
# mingw patches only apply to Python 3.11 currently
broken = (lib.versions.minor version) != "11" && stdenv.hostPlatform.isWindows;
};
})