Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging

Conflicts: pkgs/development/interpreters/ruby/ruby-19.nix pkgs/development/libraries/libc++/default.nix pkgs/development/libraries/libc++abi/default.nix pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00
parent c1cf0b7dd5 25b395bc8d
commit cd71f7a2e6
68 changed files with 640 additions and 117 deletions
@@ -14,6 +14,7 @@ stdenv.mkDerivation (rec {
  patches =
    [ ./link-against-ncurses.patch
      ./no-arch_only.patch
+      ./clang.patch
    ]
    ++
    (let