diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2016-11-12 15:51:25 -0600 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2016-11-15 19:13:23 -0600 |
commit | fc1f6f55ea6c7eb1f98027db532683755fb7d4b9 (patch) | |
tree | 43ffe21f8ccd9b8e6cb1c4bb761b2ab2a427a1c3 /pkgs/os-specific/darwin/apple-source-releases | |
parent | 4685bd7853c40ec970eaf722fcae993c10bb1b5d (diff) | |
download | nixlib-fc1f6f55ea6c7eb1f98027db532683755fb7d4b9.tar nixlib-fc1f6f55ea6c7eb1f98027db532683755fb7d4b9.tar.gz nixlib-fc1f6f55ea6c7eb1f98027db532683755fb7d4b9.tar.bz2 nixlib-fc1f6f55ea6c7eb1f98027db532683755fb7d4b9.tar.lz nixlib-fc1f6f55ea6c7eb1f98027db532683755fb7d4b9.tar.xz nixlib-fc1f6f55ea6c7eb1f98027db532683755fb7d4b9.tar.zst nixlib-fc1f6f55ea6c7eb1f98027db532683755fb7d4b9.zip |
xcbuild: Get rid of developer.nix, move to wrapper
also: - add custom outputs "specs" for xcbuild - get rid of unneeded tools - update xcbuild - add more comments - fixup xcbuild derivations Affected xcbuild derivations include: - adv_cmds - network_cmds - basic_cmds
Diffstat (limited to 'pkgs/os-specific/darwin/apple-source-releases')
3 files changed, 14 insertions, 3 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 fedd49022380..254b4a231c22 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 @@ -8,9 +8,13 @@ appleDerivation { # - os/base_private.h # - _simple.h # We disable it here for now. TODO: build pkill inside adv_cmds + + # We also disable locale here because of some issues with a missing + # "lstdc++". patchPhase = '' substituteInPlace adv_cmds.xcodeproj/project.pbxproj \ - --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" + --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" \ + --replace "FDF278D60FC6204E00D7A3C6 /* locale.cc in Sources */," "" ''; # temporary install phase until xcodebuild has "install" support diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix index 07a13966efe6..9e8b78e57d6c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix @@ -3,6 +3,14 @@ appleDerivation rec { buildInputs = [ xcbuild ]; + # These PBXcp calls should be patched in xcbuild to allow them to + # automatically be prefixed. + patchPhase = '' + substituteInPlace basic_cmds.xcodeproj/project.pbxproj \ + --replace "dstPath = /usr/share/man/man1;" "dstPath = $out/share/man/man1;" \ + --replace "dstPath = /usr/share/man/man5;" "dstPath = $out/share/man/man5;" + ''; + # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ @@ -12,7 +20,6 @@ appleDerivation rec { mkdir -p $out/share/man/man$n install */*.$n $out/share/man/man$n done - ''; meta = { diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index 71acb833cc3f..357a87689a03 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -3,7 +3,7 @@ appleDerivation rec { buildInputs = [ xcbuild openssl xnu Librpcsvc libpcap developer_cmds ]; - NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/ -D__APPLE_USE_RFC_2292 -DIPV6_DONTFRAG=14 -DINET6"; + NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/"; # "spray" requires some files that aren't compiling correctly in xcbuild. # "rtadvd" seems to fail with some missing constants. |