diff options
author | Dan Peebles <pumpkin@me.com> | 2017-10-11 21:31:59 -0400 |
---|---|---|
committer | Dan Peebles <pumpkin@me.com> | 2017-10-12 07:16:22 -0400 |
commit | e86991e1e81f882d79abc32dcd8c797fceec5548 (patch) | |
tree | 35595c733321acec984ee8ebf118affa59f14427 /pkgs/os-specific/darwin/apple-source-releases | |
parent | dd53e65e2e0ec8f2637ef381272905395ec72836 (diff) | |
download | nixlib-e86991e1e81f882d79abc32dcd8c797fceec5548.tar nixlib-e86991e1e81f882d79abc32dcd8c797fceec5548.tar.gz nixlib-e86991e1e81f882d79abc32dcd8c797fceec5548.tar.bz2 nixlib-e86991e1e81f882d79abc32dcd8c797fceec5548.tar.lz nixlib-e86991e1e81f882d79abc32dcd8c797fceec5548.tar.xz nixlib-e86991e1e81f882d79abc32dcd8c797fceec5548.tar.zst nixlib-e86991e1e81f882d79abc32dcd8c797fceec5548.zip |
darwin: fix assorted xcbuild builds
This includes adding a new xcbuild-based libutil build to test the waters a bit there. We'll need to get xcbuild into the stdenv bootstrap before we can make the main build, but it's nice to see that it can work.
Diffstat (limited to 'pkgs/os-specific/darwin/apple-source-releases')
4 files changed, 56 insertions, 10 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index 254b4a231c22..a3d4099399b3 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -1,6 +1,8 @@ -{ stdenv, appleDerivation, fetchurl, xcbuild, libcxx }: +{ stdenv, appleDerivation, fetchurl, xcbuild, ncurses, libutil-new }: appleDerivation { + # We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264 + dontUseXcbuild = true; # pkill requires special private headers that are unavailable in # NixPkgs. These ones are needed: @@ -14,7 +16,19 @@ appleDerivation { patchPhase = '' substituteInPlace adv_cmds.xcodeproj/project.pbxproj \ --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" \ - --replace "FDF278D60FC6204E00D7A3C6 /* locale.cc in Sources */," "" + --replace "FDF278D60FC6204E00D7A3C6 /* locale.cc in Sources */," "" \ + --replace '/usr/lib/libtermcap.dylib' 'libncurses.dylib' + ''; + + buildPhase = '' + targets=$(xcodebuild -list \ + | awk '/Targets:/{p=1;print;next} p&&/^\s*$/{p=0};p' \ + | tail -n +2 | sed 's/^[ \t]*//' \ + | grep -v -e Desktop -e Embedded -e mklocale -e colldef) + + for i in $targets; do + xcodebuild -target $i + done ''; # temporary install phase until xcodebuild has "install" support @@ -35,10 +49,7 @@ appleDerivation { # ln -s $out/share/man/man1/pkill.1 $out/share/man/man1/pgrep.1 ''; - buildInputs = [ xcbuild libcxx ]; - - # temporary fix for iostream issue - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + buildInputs = [ xcbuild ncurses libutil-new ]; meta = { platforms = stdenv.lib.platforms.darwin; diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index a8509d1f0095..0e8389948870 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -221,6 +221,7 @@ let libresolv = applePackage "libresolv" "osx-10.11.6" "09flfdi3dlzq0yap32sxidacpc4nn4va7z12a6viip21ix2xb2gf" {}; Libsystem = applePackage "Libsystem" "osx-10.11.6" "1nfkmbqml587v2s1d1y2s2v8nmr577jvk51y6vqrfvsrhdhc2w94" {}; libutil = applePackage "libutil" "osx-10.11.6" "1gmgmcyqdyc684ih7dimdmxdljnq7mzjy5iqbf589wc0pa8h5abm" {}; + libutil-new = applePackage "libutil/new.nix" "osx-10.11.6" "1gmgmcyqdyc684ih7dimdmxdljnq7mzjy5iqbf589wc0pa8h5abm" {}; libunwind = applePackage "libunwind" "osx-10.11.6" "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {}; mDNSResponder = applePackage "mDNSResponder" "osx-10.11.6" "069incq28a78yh1bnr17h9cd5if5mwqpq8ahnkyxxx25fkaxgzcf" {}; objc4 = applePackage "objc4" "osx-10.11.6" "00b7vbgxni8frrqyi69b4njjihlwydzjd9zj9x4z5dbx8jabkvrj" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix index 2618b4974f9f..8346ca7a9a76 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix @@ -1,7 +1,7 @@ -{ stdenv, appleDerivation, xcbuild, zlib, bzip2, lzma }: +{ stdenv, appleDerivation, xcbuild, zlib, bzip2, lzma, ncurses, libutil-new }: appleDerivation rec { - buildInputs = [ xcbuild zlib bzip2 lzma ]; + buildInputs = [ xcbuild zlib bzip2 lzma ncurses libutil-new ]; # some commands not working: # mtree: _simple.h not found @@ -11,14 +11,15 @@ appleDerivation rec { substituteInPlace file_cmds.xcodeproj/project.pbxproj \ --replace "FC8A8CAA14B655FD001B97AD /* PBXTargetDependency */," "" \ --replace "FC8A8C9C14B655FD001B97AD /* PBXTargetDependency */," "" \ - --replace "productName = file_cmds;" "" + --replace "productName = file_cmds;" "" \ + --replace '/usr/lib/libcurses.dylib' 'libncurses.dylib' sed -i -re "s/name = ([a-zA-Z]+);/name = \1; productName = \1;/" file_cmds.xcodeproj/project.pbxproj ''; # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install file_cmds-*/Build/Products/Release/* $out/bin/ + install file_cmds-*/Build/Products/Release/* $out/bin for n in 1; do mkdir -p $out/share/man/man$n diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix new file mode 100644 index 000000000000..860a74f61f7f --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix @@ -0,0 +1,33 @@ +{ stdenv, appleDerivation, xcbuild }: + +# TODO: make this the official libutil expression once we've integrated xcbuild in the bootstrap +appleDerivation { + buildInputs = [ xcbuild ]; + + dontUseXcbuild = true; + + prePatch = '' + substituteInPlace tzlink.c \ + --replace '#include <xpc/xpc.h>' "" + ''; + + buildPhase = '' + xcodebuild -target util + ''; + + installPhase = '' + mkdir -p $out/lib $out/include + + cp libutil-*/Build/Products/Release/*.dylib $out/lib + cp libutil-*/Build/Products/Release/*.h $out/include + + # TODO: figure out how to get this to be right the first time around + install_name_tool -id $out/lib/libutil.dylib $out/lib/libutil.dylib + ''; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ copumpkin ]; + platforms = platforms.darwin; + license = licenses.apsl20; + }; +} |