diff options
| author | Dan Peebles <pumpkin@me.com> | 2016-08-14 18:22:19 -0400 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2016-08-14 18:22:19 -0400 |
| commit | ea34fe82bced57d11127d4c23e5a5ade9fa56334 (patch) | |
| tree | bdd927064b7b7a80dc20d404deb5de0d3975e6be /pkgs | |
| parent | 4705a9a6c1809840333a612aabe1fc8feb5c089e (diff) | |
| download | nixlib-ea34fe82bced57d11127d4c23e5a5ade9fa56334.tar nixlib-ea34fe82bced57d11127d4c23e5a5ade9fa56334.tar.gz nixlib-ea34fe82bced57d11127d4c23e5a5ade9fa56334.tar.bz2 nixlib-ea34fe82bced57d11127d4c23e5a5ade9fa56334.tar.lz nixlib-ea34fe82bced57d11127d4c23e5a5ade9fa56334.tar.xz nixlib-ea34fe82bced57d11127d4c23e5a5ade9fa56334.tar.zst nixlib-ea34fe82bced57d11127d4c23e5a5ade9fa56334.zip | |
swift-corefoundation: some cleanup
I upstreamed some patches so I'm using those now
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/darwin/swift-corefoundation/default.nix | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/os-specific/darwin/swift-corefoundation/default.nix b/pkgs/os-specific/darwin/swift-corefoundation/default.nix index f69aa59c09c3..969168fa54ba 100644 --- a/pkgs/os-specific/darwin/swift-corefoundation/default.nix +++ b/pkgs/os-specific/darwin/swift-corefoundation/default.nix @@ -6,28 +6,22 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "apple"; repo = "swift-corelibs-foundation"; - rev = "87d1a97d6af07fec568765c47daddff0aaa0d59c"; - sha256 = "05cmqwzqqxb489g9hq7hhj2yva12pi488iblbpnvyk1y4nx077cw"; + rev = "dce4233f583ec15190b240d6116396bf9641cd57"; + sha256 = "0i2ldvy14x05k2vgl5z0g5l2i5llifdfbij5zwfdwb8jmmq215qr"; }; buildInputs = [ ninja python libxml2 ]; patchPhase = '' - HACK=$PWD/hack - mkdir -p $HACK/CoreFoundation - cp CoreFoundation/Base.subproj/CFAsmMacros.h $HACK/CoreFoundation - substituteInPlace CoreFoundation/build.py \ - --replace "','" "'," \ --replace '-I''${SYSROOT}/usr/include/libxml2' '-I${libxml2.dev}/include/libxml2' \ - --replace 'cf.ASFLAGS = " ".join([' "cf.ASFLAGS = ' '.join([ '-I$HACK', " \ ''; - configureFlags = "--sysroot unused"; + configurePhase = ":"; buildPhase = '' cd CoreFoundation - ../configure --sysroot foo + ../configure --sysroot unused ninja ''; |