diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-05-01 10:23:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-01 10:23:38 -0500 |
| commit | ca4fe58b4426b2315d4674b804100c9abe91be92 (patch) | |
| tree | a634c3e13b11e7e94aa547f1f16616ecf76ebd64 /pkgs/development/interpreters | |
| parent | e49a9bdb66c58a3682c0a6bc3916ef69768e1c5b (diff) | |
| parent | b8917dc0f3d8e66c1fac0ea84440c05330f99f5a (diff) | |
| download | nixlib-ca4fe58b4426b2315d4674b804100c9abe91be92.tar nixlib-ca4fe58b4426b2315d4674b804100c9abe91be92.tar.gz nixlib-ca4fe58b4426b2315d4674b804100c9abe91be92.tar.bz2 nixlib-ca4fe58b4426b2315d4674b804100c9abe91be92.tar.lz nixlib-ca4fe58b4426b2315d4674b804100c9abe91be92.tar.xz nixlib-ca4fe58b4426b2315d4674b804100c9abe91be92.tar.zst nixlib-ca4fe58b4426b2315d4674b804100c9abe91be92.zip | |
Merge pull request #39627 from veprbl/pr/python_issue24658
python35, python36: fix reading large files on darwin
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/3.5/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/3.6/default.nix | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index d67cc7286942..c6d572aca164 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -67,6 +67,12 @@ in stdenv.mkDerivation { patches = [ ./no-ldconfig.patch ./ld_library_path.patch + ] ++ optionals stdenv.isDarwin [ + # Fix for https://bugs.python.org/issue24658 + (fetchpatch { + url = "https://bugs.python.org/file45178/issue24658-3-3.6.diff"; + sha256 = "1x060hs80nl34mcl2ji2i7l4shxkmxwgq8h8lcmav8rjqqz1nb4a"; + }) ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch ]; diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index ee9a0df9a8c4..e5e05c0ac7a3 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -69,6 +69,12 @@ in stdenv.mkDerivation { patches = [ ./no-ldconfig.patch + ] ++ optionals stdenv.isDarwin [ + # Fix for https://bugs.python.org/issue24658 + (fetchpatch { + url = "https://bugs.python.org/file45178/issue24658-3-3.6.diff"; + sha256 = "1x060hs80nl34mcl2ji2i7l4shxkmxwgq8h8lcmav8rjqqz1nb4a"; + }) ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch ]; |