diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-03-09 19:32:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-09 19:32:54 +0100 |
| commit | 43be4ebfb15b57b36e30ba390a73315ea3890087 (patch) | |
| tree | 3a76b251f7d4efb3a1328c10ee3acbcd3222af6e /pkgs/os-specific/darwin | |
| parent | 3d69037956301ec5a976199fe5226e458083715f (diff) | |
| parent | c7abef4c5d724421e136b8d53e3fe18fc48451ed (diff) | |
| download | nixlib-43be4ebfb15b57b36e30ba390a73315ea3890087.tar nixlib-43be4ebfb15b57b36e30ba390a73315ea3890087.tar.gz nixlib-43be4ebfb15b57b36e30ba390a73315ea3890087.tar.bz2 nixlib-43be4ebfb15b57b36e30ba390a73315ea3890087.tar.lz nixlib-43be4ebfb15b57b36e30ba390a73315ea3890087.tar.xz nixlib-43be4ebfb15b57b36e30ba390a73315ea3890087.tar.zst nixlib-43be4ebfb15b57b36e30ba390a73315ea3890087.zip | |
Merge pull request #36581 from matthewbauer/darwin-fixes
darwin: fixes
Diffstat (limited to 'pkgs/os-specific/darwin')
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix | 4 |
2 files changed, 7 insertions, 3 deletions
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 357a87689a03..dc7edface9a0 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 @@ -7,11 +7,13 @@ appleDerivation rec { # "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. + # "traceroute6" and "ping6" require ipsec which doesn't build correctly patchPhase = '' substituteInPlace network_cmds.xcodeproj/project.pbxproj \ --replace "7294F0EA0EE8BAC80052EC88 /* PBXTargetDependency */," "" \ - --replace "7216D34D0EE89FEC00AE70E4 /* PBXTargetDependency */," "" + --replace "7216D34D0EE89FEC00AE70E4 /* PBXTargetDependency */," "" \ + --replace "72CD1D9C0EE8C47C005F825D /* PBXTargetDependency */," "" \ + --replace "7216D2C20EE89ADF00AE70E4 /* PBXTargetDependency */," "" ''; # temporary install phase until xcodebuild has "install" support diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix index f434e15794ea..4f527acc950c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix @@ -10,10 +10,12 @@ appleDerivation rec { # - su ('security/pam_appl.h' file not found) # - find (Undefined symbol '_get_date') # - w (Undefined symbol '_res_9_init') + # - expr substituteInPlace shell_cmds.xcodeproj/project.pbxproj \ --replace "FCBA168714A146D000AA698B /* PBXTargetDependency */," "" \ --replace "FCBA165914A146D000AA698B /* PBXTargetDependency */," "" \ - --replace "FCBA169514A146D000AA698B /* PBXTargetDependency */," "" + --replace "FCBA169514A146D000AA698B /* PBXTargetDependency */," "" \ + --replace "FCBA165514A146D000AA698B /* PBXTargetDependency */," "" # disable w, test install # get rid of permission stuff |