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/compilers/llvm/3.6/default.nix
+++ b/pkgs/development/compilers/llvm/3.6/default.nix
@@ -1,6 +1,6 @@
 { pkgs, newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }:
 let
-  callPackage = newScope (self // { inherit isl version fetch; });
+  callPackage = newScope (self // { inherit stdenv isl version fetch; });

  version = "3.6.1";