diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-05 19:42:16 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-05 19:42:16 +0200 |
| commit | 1c68570ab297a96861ec87034ff9ef155e23b0a4 (patch) | |
| tree | a6785ac0ec23ec3b4686ec4c11b0cc4590320c80 /pkgs/development/interpreters/python/cpython | |
| parent | 462aa777dfbb45829321dead7749382e3d551e8c (diff) | |
| parent | 43f71029cc6b18c1b4db4d01b35dbb30425c2f4e (diff) | |
| download | nixlib-1c68570ab297a96861ec87034ff9ef155e23b0a4.tar nixlib-1c68570ab297a96861ec87034ff9ef155e23b0a4.tar.gz nixlib-1c68570ab297a96861ec87034ff9ef155e23b0a4.tar.bz2 nixlib-1c68570ab297a96861ec87034ff9ef155e23b0a4.tar.lz nixlib-1c68570ab297a96861ec87034ff9ef155e23b0a4.tar.xz nixlib-1c68570ab297a96861ec87034ff9ef155e23b0a4.tar.zst nixlib-1c68570ab297a96861ec87034ff9ef155e23b0a4.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/interpreters/python/cpython')
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 8886b60d39e4..ee77185cde65 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -110,7 +110,7 @@ in with passthru; stdenv.mkDerivation { # Backport a fix for discovering `rpmbuild` command when doing `python setup.py bdist_rpm` to 3.5, 3.6, 3.7. # See: https://bugs.python.org/issue11122 ./3.7/fix-hardcoded-path-checking-for-rpmbuild.patch - ] ++ optionals (isPy37 || isPy38) [ + ] ++ optionals (isPy37 || isPy38 || isPy39) [ # Fix darwin build https://bugs.python.org/issue34027 ./3.7/darwin-libutil.patch ] ++ optionals (pythonOlder "3.8") [ @@ -129,7 +129,7 @@ in with passthru; stdenv.mkDerivation { ( if isPy35 then ./3.5/python-3.x-distutils-C++.patch - else if isPy37 || isPy38 then + else if isPy37 || isPy38 || isPy39 then ./3.7/python-3.x-distutils-C++.patch else fetchpatch { |