summary refs log tree commit diff
path: root/pkgs/os-specific/darwin/apple-source-releases/adv_cmds
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2016-11-12 15:51:25 -0600
committerMatthew Bauer <mjbauer95@gmail.com>2016-11-15 19:13:23 -0600
commitfc1f6f55ea6c7eb1f98027db532683755fb7d4b9 (patch)
tree43ffe21f8ccd9b8e6cb1c4bb761b2ab2a427a1c3 /pkgs/os-specific/darwin/apple-source-releases/adv_cmds
parent4685bd7853c40ec970eaf722fcae993c10bb1b5d (diff)
downloadnixlib-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/adv_cmds')
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix6
1 files changed, 5 insertions, 1 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