diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-09-06 15:05:30 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-04-12 19:16:51 -0400 |
commit | 1001311280bc74bc020a2bed0491c25c5010a091 (patch) | |
tree | 4f219d064e5da12ccb57a5c505655990e798df79 /pkgs/os-specific/darwin/cctools | |
parent | 01e1722e8fe932106d65bc87b83e5684534fa6e6 (diff) | |
download | nixlib-1001311280bc74bc020a2bed0491c25c5010a091.tar nixlib-1001311280bc74bc020a2bed0491c25c5010a091.tar.gz nixlib-1001311280bc74bc020a2bed0491c25c5010a091.tar.bz2 nixlib-1001311280bc74bc020a2bed0491c25c5010a091.tar.lz nixlib-1001311280bc74bc020a2bed0491c25c5010a091.tar.xz nixlib-1001311280bc74bc020a2bed0491c25c5010a091.tar.zst nixlib-1001311280bc74bc020a2bed0491c25c5010a091.zip |
cctools: Add alternative source for sierra hack
Source master rebase of my [PR #34]. Eventually, we might consider doing something for GNU binutils too, in order that we switch (the normal) ld-wrapper to always use this to leverage ld to resolve libraries, rather than faking it in bash. [PR #34]: https://github.com/tpoechtrager/cctools-port/pull/34
Diffstat (limited to 'pkgs/os-specific/darwin/cctools')
-rw-r--r-- | pkgs/os-specific/darwin/cctools/port.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 0eef47ed6dfe..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 @@ -20,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" ]; |