Merge #8363: pure-darwin stdenv

2015-06-18 22:23:55 +02:00
parent 8e19ac8d7c fe75f16032
commit 61596bf405
119 changed files with 11653 additions and 3864 deletions
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -64,6 +64,8 @@ let
      for i in Lib/plat-*/regen; do
        substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/
      done
+    '' + optionalString stdenv.isDarwin ''
+      substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
    '';

  configureFlags = [
@@ -74,6 +76,8 @@ let
    "--with-system-ffi"
    "--with-system-expat"
    "ac_cv_func_bind_textdomain_codeset=yes"
+  ] ++ optionals stdenv.isDarwin [
+    "--disable-toolbox-glue"
  ];

  postConfigure = if stdenv.isCygwin then ''