about summary refs log tree commit diff
path: root/pkgs/development/interpreters/python
diff options
context:
space:
mode:
authorDan Peebles <pumpkin@me.com>2018-09-09 13:36:05 -0400
committerDan Peebles <pumpkin@me.com>2018-09-15 16:05:46 -0400
commit4efd4053ed183d63f09615cf30ea822e708a4fbe (patch)
treed5f3e3c30303a936c1508e82fa63759685610e9a /pkgs/development/interpreters/python
parentb93f4234e8b662600dc3caba2ed2fbc1fb7619d9 (diff)
downloadnixlib-4efd4053ed183d63f09615cf30ea822e708a4fbe.tar
nixlib-4efd4053ed183d63f09615cf30ea822e708a4fbe.tar.gz
nixlib-4efd4053ed183d63f09615cf30ea822e708a4fbe.tar.bz2
nixlib-4efd4053ed183d63f09615cf30ea822e708a4fbe.tar.lz
nixlib-4efd4053ed183d63f09615cf30ea822e708a4fbe.tar.xz
nixlib-4efd4053ed183d63f09615cf30ea822e708a4fbe.tar.zst
nixlib-4efd4053ed183d63f09615cf30ea822e708a4fbe.zip
stdenv/darwin: integrate a new CoreFoundation
This also updates the bootstrap tool builder to LLVM 5, but not the ones
we actually use for bootstrap. I'll make that change in a subsequent commit
so as to provide traceable provenance of the bootstrap tools.
Diffstat (limited to 'pkgs/development/interpreters/python')
-rw-r--r--pkgs/development/interpreters/python/cpython/2.7/boot.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
index 7d6f2541d3d1..976d30819dbe 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/boot.nix
@@ -43,6 +43,15 @@ stdenv.mkDerivation rec {
       ./deterministic-build.patch
     ];
 
+  # Hack hack hack to stop shit from failing from a missing _scproxy on Darwin. Since
+  # we only use this python for bootstrappy things, it doesn't really matter if it
+  # doesn't have perfect proxy support in urllib :) this just makes it fall back on env
+  # vars instead of attempting to read the proxy configuration automatically, so not a
+  # huge loss even if for whatever reason we did want proxy support.
+  postPatch = ''
+    substituteInPlace Lib/urllib.py --replace "if sys.platform == 'darwin'" "if False"
+  '';
+
   DETERMINISTIC_BUILD = 1;
 
   preConfigure = ''