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

python36: fix darwin build

Browse Source 
Remove issue24658 patch because is already fixed and backported to
Python 3.6 a5ebc205be
This commit is contained in:
Mario Rodas 2018-12-26 15:34:20 -05:00 committed by Frederik Rietdijk
parent 9f2f78b7e2
commit 31680c54e1
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/interpreters/python/cpython/3.6/default.nix
View File

@ -69,12 +69,6 @@ in stdenv.mkDerivation {
patches = [ patches = [
./no-ldconfig.patch ./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) [ ] ++ optionals (x11Support && stdenv.isDarwin) [
./use-correct-tcl-tk-on-darwin.patch ./use-correct-tcl-tk-on-darwin.patch
] ++ optionals hasDistutilsCxxPatch [ ] ++ optionals hasDistutilsCxxPatch [
@ -83,8 +77,8 @@ in stdenv.mkDerivation {
# only works for GCC and Apple Clang. This makes distutils to call C++ # only works for GCC and Apple Clang. This makes distutils to call C++
# compiler when needed. # compiler when needed.
(fetchpatch { (fetchpatch {
url = "https://bugs.python.org/file47669/python-3.8-distutils-C++.patch"; url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch";
sha256 = "0s801d7ww9yrk6ys053jvdhl0wicbznx08idy36f1nrrxsghb3ii"; sha256 = "1h18lnpx539h5lfxyk379dxwr8m2raigcjixkf133l4xy3f4bzi2";
}) })
]; ];