lol

swift-corefoundation: some cleanup

I upstreamed some patches so I'm using those now

+4 -10
+4 -10
pkgs/os-specific/darwin/swift-corefoundation/default.nix
··· 6 6 src = fetchFromGitHub { 7 7 owner = "apple"; 8 8 repo = "swift-corelibs-foundation"; 9 - rev = "87d1a97d6af07fec568765c47daddff0aaa0d59c"; 10 - sha256 = "05cmqwzqqxb489g9hq7hhj2yva12pi488iblbpnvyk1y4nx077cw"; 9 + rev = "dce4233f583ec15190b240d6116396bf9641cd57"; 10 + sha256 = "0i2ldvy14x05k2vgl5z0g5l2i5llifdfbij5zwfdwb8jmmq215qr"; 11 11 }; 12 12 13 13 buildInputs = [ ninja python libxml2 ]; 14 14 15 15 patchPhase = '' 16 - HACK=$PWD/hack 17 - mkdir -p $HACK/CoreFoundation 18 - cp CoreFoundation/Base.subproj/CFAsmMacros.h $HACK/CoreFoundation 19 - 20 16 substituteInPlace CoreFoundation/build.py \ 21 - --replace "','" "'," \ 22 17 --replace '-I''${SYSROOT}/usr/include/libxml2' '-I${libxml2.dev}/include/libxml2' \ 23 - --replace 'cf.ASFLAGS = " ".join([' "cf.ASFLAGS = ' '.join([ '-I$HACK', " \ 24 18 ''; 25 19 26 - configureFlags = "--sysroot unused"; 20 + configurePhase = ":"; 27 21 28 22 buildPhase = '' 29 23 cd CoreFoundation 30 - ../configure --sysroot foo 24 + ../configure --sysroot unused 31 25 ninja 32 26 ''; 33 27