Merge branch 'master' into closure-size

2015-11-29 16:50:26 +01:00
parent 07a0204282 a9056371a0
commit 920b1d3591
241 changed files with 13028 additions and 1473 deletions
@@ -28,13 +28,8 @@ stdenv.mkDerivation rec {
  patches =
    # Don't search in non-Nix locations such as /usr, but do search in
    # Nixpkgs' Glibc.
-    optional (stdenv ? glibc) ./search-path-3.2.patch ++
-    optional (stdenv ? cross) (fetchurl {
-      name = "fix-darwin-cross-compile.patch";
-      url = "http://public.kitware.com/Bug/file_download.php?"
-          + "file_id=4981&type=bug";
-      sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
-    }) ++ stdenv.lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch;
+    optional (stdenv ? glibc) ./search-path-3.2.patch
+    ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch;

  outputs = [ "out" "doc" ];
  setOutputFlags = false;