Merge pull request #56744 from matthewbauer/macos-10-12

Update macOS to 10.12
2019-04-26 22:20:03 -04:00
parent 1cf626ce29 c1f1a0ea15
commit 87944c3125
196 changed files with 1221 additions and 3284 deletions
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -418,6 +418,7 @@ stdenv.mkDerivation ({
      stdenv.lib.platforms.freebsd ++
      stdenv.lib.platforms.illumos ++
      stdenv.lib.platforms.darwin;
+    badPlatforms = [ "x86_64-darwin" ];
  };
 }

--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -430,6 +430,7 @@ stdenv.mkDerivation ({
      stdenv.lib.platforms.freebsd ++
      stdenv.lib.platforms.illumos ++
      stdenv.lib.platforms.darwin;
+    badPlatforms = [ "x86_64-darwin" ];
  };
 }

--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -435,6 +435,7 @@ stdenv.mkDerivation ({
      stdenv.lib.platforms.freebsd ++
      stdenv.lib.platforms.illumos ++
      stdenv.lib.platforms.darwin;
+    badPlatforms = [ "x86_64-darwin" ];
  };
 }