diff options
author | John Ericson <Ericson2314@yahoo.com> | 2018-04-13 14:39:56 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-13 14:39:56 -0400 |
commit | 800cb8ae71425a655e34f32dcbdce9fcb3cfe143 (patch) | |
tree | d33e88448ab1348100622aa4b14ac799155780f7 /pkgs/os-specific | |
parent | 5d9bd57c635a5d67b717cf649a937d7cf448f2c8 (diff) | |
parent | 1a72330ab067cb3c48c6e6ef3d5e0d2d24a95417 (diff) | |
download | nixlib-800cb8ae71425a655e34f32dcbdce9fcb3cfe143.tar nixlib-800cb8ae71425a655e34f32dcbdce9fcb3cfe143.tar.gz nixlib-800cb8ae71425a655e34f32dcbdce9fcb3cfe143.tar.bz2 nixlib-800cb8ae71425a655e34f32dcbdce9fcb3cfe143.tar.lz nixlib-800cb8ae71425a655e34f32dcbdce9fcb3cfe143.tar.xz nixlib-800cb8ae71425a655e34f32dcbdce9fcb3cfe143.tar.zst nixlib-800cb8ae71425a655e34f32dcbdce9fcb3cfe143.zip |
Merge pull request #38881 from obsidiansystems/sierra-hack
cc-wrapper: More intelligent sierra hack
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/darwin/cctools/port.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index bcca11d66b19..55995c1592d1 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -2,6 +2,7 @@ , llvm, libcxx, libcxxabi, clang, libuuid , libobjc ? null, maloader ? null, xctoolchain ? null , hostPlatform, targetPlatform +, enableDumpNormalizedLibArgs ? false }: let @@ -12,8 +13,6 @@ let "${targetPlatform.config}-"; in -assert targetPlatform.isDarwin; - # Non-Darwin alternatives assert (!hostPlatform.isDarwin) -> (maloader != null && xctoolchain != null); @@ -22,12 +21,18 @@ let name = "${targetPrefix}cctools-port-${version}"; version = "895"; - src = fetchFromGitHub { + src = fetchFromGitHub (if enableDumpNormalizedLibArgs then { + owner = "tpoechtrager"; + repo = "cctools-port"; + # master with https://github.com/tpoechtrager/cctools-port/pull/34 + rev = "8395d4b2c3350356e2fb02f5e04f4f463c7388df"; + sha256 = "10vbf1cfzx02q8chc77s84fp2kydjpx2y682mr6mrbb7sq5rwh8f"; + } else { owner = "tpoechtrager"; repo = "cctools-port"; rev = "2e569d765440b8cd6414a695637617521aa2375b"; # From branch 895-ld64-274.2 sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52"; - }; + }); outputs = [ "out" "dev" ]; @@ -117,6 +122,7 @@ let }; meta = { + broken = !targetPlatform.isDarwin; # Only supports darwin targets homepage = http://www.opensource.apple.com/source/cctools/; description = "MacOS Compiler Tools (cross-platform port)"; license = stdenv.lib.licenses.apsl20; |