···11-{ stdenv, fetchurl, autoconf, automake, libtool_2
11+{ stdenv, fetchFromGitHub, autoconf, automake, libtool_2
22, llvm, libcxx, libcxxabi, clang, openssl, libuuid
33, libobjc ? null
44}:
···66let
77 baseParams = rec {
88 name = "cctools-port-${version}";
99- version = "862";
99+ version = "877.5";
10101111- src = let
1212- # Should be fetchFromGitHub but it was whining so this will do for now
1111+ src = fetchFromGitHub {
1312 owner = "tpoechtrager";
1413 repo = "cctools-port";
1515- rev = "59d21d2c793c51d205c8b4ab14b9b28e63c72445";
1616- in fetchurl {
1717- url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz";
1818- sha256 = "01f31ijpnplbiyp7ldwzy8vbkn3j3m56n5blsvsav5nlp4lp2g71";
1414+ rev = "7d405492b09fa27546caaa989b8493829365deab";
1515+ sha256 = "0nj1q5bqdx5jm68dispybxc7wnkb6p8p2igpnap9q6qyv2r9p07w";
1916 };
20172118 buildInputs = [ autoconf automake libtool_2 openssl libuuid ] ++
···5956 sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' cctools/autogen.sh
6057 '';
61585959+ # TODO: this builds an ld without support for LLVM's LTO. We need to teach it, but that's rather
6060+ # hairy to handle during bootstrap. Perhaps it could be optional?
6261 preConfigure = ''
6362 cd cctools
6463 sh autogen.sh