diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-14 02:24:17 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-14 02:24:17 +0100 |
| commit | b813710c0475677fc7148262bdf465d9b5467249 (patch) | |
| tree | 115eb9db85f707e6b6791d6daa1dfa6114b5380b /pkgs/development/interpreters | |
| parent | 318e673af062b372d52cf231ccc36d19f43365c1 (diff) | |
| parent | acc4bb890e0be0a1f1bd086b94a207177c306552 (diff) | |
| download | nixpkgs-b813710c0475677fc7148262bdf465d9b5467249.tar nixpkgs-b813710c0475677fc7148262bdf465d9b5467249.tar.gz nixpkgs-b813710c0475677fc7148262bdf465d9b5467249.tar.bz2 nixpkgs-b813710c0475677fc7148262bdf465d9b5467249.tar.lz nixpkgs-b813710c0475677fc7148262bdf465d9b5467249.tar.xz nixpkgs-b813710c0475677fc7148262bdf465d9b5467249.tar.zst nixpkgs-b813710c0475677fc7148262bdf465d9b5467249.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 9100dfc82c4..2e4e2f1f6db 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -216,7 +216,7 @@ in with passthru; stdenv.mkDerivation { else ./3.7/fix-finding-headers-when-cross-compiling.patch ) - ] ++ optionals (isPy37) [ + ] ++ optionals (isPy36 || isPy37) [ # Backport a fix for ctypes.util.find_library. ./3.7/find_library.patch ]; |