diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-02-23 13:51:34 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-02-23 13:51:34 +0000 |
commit | 52c286ee5b3b8f5c521b17411782311a313f2e4c (patch) | |
tree | 948b519d8517d88cd81124703e5b4f35daf25019 /pkgs/development/interpreters/python | |
parent | 390b789c3950307a9dc6bb57d2f5f0ae69cfc76b (diff) | |
parent | 129b6f78121802d18d215c9f9e04d7971c58ea0c (diff) | |
download | nixpkgs-52c286ee5b3b8f5c521b17411782311a313f2e4c.tar nixpkgs-52c286ee5b3b8f5c521b17411782311a313f2e4c.tar.gz nixpkgs-52c286ee5b3b8f5c521b17411782311a313f2e4c.tar.bz2 nixpkgs-52c286ee5b3b8f5c521b17411782311a313f2e4c.tar.lz nixpkgs-52c286ee5b3b8f5c521b17411782311a313f2e4c.tar.xz nixpkgs-52c286ee5b3b8f5c521b17411782311a313f2e4c.tar.zst nixpkgs-52c286ee5b3b8f5c521b17411782311a313f2e4c.zip |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/libraries/pmdk/default.nix
Diffstat (limited to 'pkgs/development/interpreters/python')
-rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 706dd931c78..9cd806c0523 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -256,7 +256,7 @@ in with passthru; stdenv.mkDerivation ({ LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; - NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.targetPlatform.system == "x86_64-darwin") "-msse2" + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.targetPlatform.system == "x86_64-darwin") "-msse2" + lib.optionalString stdenv.hostPlatform.isMusl " -DTHREAD_STACK_SIZE=0x100000"; DETERMINISTIC_BUILD = 1; |