Merge branch 'staging'

Darwin isn't in a perfect state, in particular its bootstrap tools won't build which will block nixpkgs channel. But on the whole it seems acceptable.
2016-05-13 10:14:53 +02:00
parent df8958435e 6c2fbfbd77
commit 3e387c3e00
500 changed files with 5469 additions and 5737 deletions
@@ -105,7 +105,7 @@ stdenv.mkDerivation {
      nspr
      nss
      pango
-    ] + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [
+    ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [
      stdenv.cc.cc
    ];