xcbuild: update meta and comments

This commit is contained in:
Matthew Bauer 2016-11-10 14:56:58 -06:00
parent 437bdc5e4b
commit 4685bd7853
No known key found for this signature in database
GPG Key ID: E04D0AD9469141C3
4 changed files with 19 additions and 9 deletions

View File

@ -17,7 +17,6 @@ appleDerivation rec {
'';
meta = with stdenv.lib; {
description = "";
maintainers = with maintainers; [ matthewbauer ];
platforms = platforms.darwin;
license = licenses.apsl20;

View File

@ -1,7 +1,13 @@
{ stdenv, appleDerivation, fetchurl, xcbuild, libcxx }:
appleDerivation {
# disable pkill from build
# pkill requires special private headers that are unavailable in
# NixPkgs. These ones are needed:
# - xpc/xpxc.h
# - os/base_private.h
# - _simple.h
# We disable it here for now. TODO: build pkill inside adv_cmds
patchPhase = ''
substituteInPlace adv_cmds.xcodeproj/project.pbxproj \
--replace "FD201DC214369B4200906237 /* pkill.c in Sources */," ""

View File

@ -5,8 +5,10 @@ appleDerivation rec {
NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/ -D__APPLE_USE_RFC_2292 -DIPV6_DONTFRAG=14 -DINET6";
# "spray" requires some files that aren't compiling correctly in xcbuild.
# "rtadvd" seems to fail with some missing constants.
# We disable spray and rtadvd here for now.
patchPhase = ''
# disable spray, rtadvd
substituteInPlace network_cmds.xcodeproj/project.pbxproj \
--replace "7294F0EA0EE8BAC80052EC88 /* PBXTargetDependency */," "" \
--replace "7216D34D0EE89FEC00AE70E4 /* PBXTargetDependency */," ""
@ -22,14 +24,16 @@ appleDerivation rec {
install */*.$n $out/share/man/man$n
done
mkdir -p $out/etc/
install rtadvd.tproj/rtadvd.conf ip6addrctl.tproj/ip6addrctl.conf $out/etc/
# TODO: patch files to load from $out/ instead of /usr/
mkdir -p $out/local/OpenSourceVersions/
install network_cmds.plist $out/local/OpenSourceVersions/
# mkdir -p $out/etc/
# install rtadvd.tproj/rtadvd.conf ip6addrctl.tproj/ip6addrctl.conf $out/etc/
mkdir -p $out/System/Library/LaunchDaemons
install kdumpd.tproj/com.apple.kdumpd.plist $out/System/Library/LaunchDaemons
# mkdir -p $out/local/OpenSourceVersions/
# install network_cmds.plist $out/local/OpenSourceVersions/
# mkdir -p $out/System/Library/LaunchDaemons
# install kdumpd.tproj/com.apple.kdumpd.plist $out/System/Library/LaunchDaemons
'';
meta = {

View File

@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
cp ./contacts-*/Build/Products/Default/contacts $out/bin
'';
## FIXME: the framework setup hook isn't adding these correctly
NIX_LDFLAGS = " -F${Foundation}/Library/Frameworks/ -F${AddressBook}/Library/Frameworks/";
meta = with stdenv.lib; {