summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2019-02-18 20:42:09 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2019-02-18 20:44:19 -0500
commit0e78f2bd10df60c78144073a9f8dcd6086f046cf (patch)
tree4ffb9801d8e5b67b96222a2e380b7c4fb8d36c13 /pkgs/top-level
parent266315c91d5e4a6d7b8465eb44d4f6af30d90b30 (diff)
downloadnixpkgs-0e78f2bd10df60c78144073a9f8dcd6086f046cf.tar
nixpkgs-0e78f2bd10df60c78144073a9f8dcd6086f046cf.tar.gz
nixpkgs-0e78f2bd10df60c78144073a9f8dcd6086f046cf.tar.bz2
nixpkgs-0e78f2bd10df60c78144073a9f8dcd6086f046cf.tar.lz
nixpkgs-0e78f2bd10df60c78144073a9f8dcd6086f046cf.tar.xz
nixpkgs-0e78f2bd10df60c78144073a9f8dcd6086f046cf.tar.zst
nixpkgs-0e78f2bd10df60c78144073a9f8dcd6086f046cf.zip
Revert "cctools: bump to latest commit"
This reverts commit ac682e362c07929b2b30bfdf4f75cd1c5250d3e7.

This broke iOS building on master. Even Xcode 8.2 comes with TAPI
librarises. We need these patches to support those .tbd files.
Eventually we will move to using libtapi directly, but I have not
finished work on this right now.

Unfortunately, this will not have my changes for building cctools with
manpages. We will have to do this update at some later time.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a2ea5c82ce..4d5134c7cae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6635,6 +6635,11 @@ in
     name = "clang-wrapper-with-reexport-hack";
     bintools = darwin.binutils.override {
       useMacosReexportHack = true;
+      bintools = darwin.binutils.bintools.override {
+        cctools = darwin.cctools.override {
+          enableDumpNormalizedLibArgs = true;
+        };
+      };
     };
   };