Merge staging into closure-size

2015-05-05 11:49:03 +02:00
parent 2f75c68459 7f9ccc6284
commit 375bc8def7
869 changed files with 36250 additions and 30353 deletions
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -149,7 +149,7 @@ stdenv.mkDerivation {
  configureScript = "./bootstrap.sh";
  configureFlags = commonConfigureFlags ++ [
    "--with-icu=${icu}"
-    "--with-python=${python}/bin/python"
+    "--with-python=${python.interpreter}"
  ] ++ optional (toolset != null) "--with-toolset=${toolset}";

  buildPhase = builder nativeB2Args;