diff options
| author | toonn <toonn@toonn.io> | 2023-04-07 20:40:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-07 20:40:41 +0200 |
| commit | 2d82b2958b3f67ed039ad51c3b0269e2dd47a73e (patch) | |
| tree | 2f9caab665157af01daa9783045c5f67458beca6 /pkgs/os-specific | |
| parent | 039a18a90877908472430629a094f49afab9d5b9 (diff) | |
| parent | 3753dfe6a9d6c325e53622baf26202f5bc48a08e (diff) | |
Merge pull request #224423 from reckenrode/network_cmds_fix
network_cmds: unconditionally exclude Unbound
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix | 10 |
1 files changed, 4 insertions, 6 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 367c0f50d038e..600571f222562 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 @@ -1,9 +1,9 @@ { lib, appleDerivation, xcbuildHook, stdenv -, libressl_3_4, Librpcsvc, xnu, libpcap, developer_cmds }: +, Librpcsvc, xnu, libpcap, developer_cmds }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; - buildInputs = [ libressl_3_4 xnu Librpcsvc libpcap developer_cmds ]; + buildInputs = [ xnu Librpcsvc libpcap developer_cmds ]; # Work around error from <stdio.h> on aarch64-darwin: # error: 'TARGET_OS_IPHONE' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_] @@ -12,15 +12,13 @@ appleDerivation { # "spray" requires some files that aren't compiling correctly in xcbuild. # "rtadvd" seems to fail with some missing constants. # "traceroute6" and "ping6" require ipsec which doesn't build correctly + # "unbound" doesn’t build against supported versions of OpenSSL or LibreSSL patchPhase = '' substituteInPlace network_cmds.xcodeproj/project.pbxproj \ --replace "7294F0EA0EE8BAC80052EC88 /* PBXTargetDependency */," "" \ --replace "7216D34D0EE89FEC00AE70E4 /* PBXTargetDependency */," "" \ --replace "72CD1D9C0EE8C47C005F825D /* PBXTargetDependency */," "" \ - --replace "7216D2C20EE89ADF00AE70E4 /* PBXTargetDependency */," "" - '' + lib.optionalString stdenv.isAarch64 '' - # "unbound" does not build on aarch64 - substituteInPlace network_cmds.xcodeproj/project.pbxproj \ + --replace "7216D2C20EE89ADF00AE70E4 /* PBXTargetDependency */," "" \ --replace "71D958C51A9455A000C9B286 /* PBXTargetDependency */," "" ''; |