summary refs log tree commit diff
path: root/pkgs/os-specific/darwin/apple-source-releases
diff options
context:
space:
mode:
authorRandy Eckenrode <randy@largeandhighquality.com>2023-04-02 20:34:42 -0400
committerRandy Eckenrode <randy@largeandhighquality.com>2023-04-02 20:59:49 -0400
commit3753dfe6a9d6c325e53622baf26202f5bc48a08e (patch)
tree52e3597f6a012fca6f12e75b200e4c8bfc51d3f3 /pkgs/os-specific/darwin/apple-source-releases
parentb1581c36189e5063163acb24822ed8a343bf6a8f (diff)
downloadnixpkgs-3753dfe6a9d6c325e53622baf26202f5bc48a08e.tar
nixpkgs-3753dfe6a9d6c325e53622baf26202f5bc48a08e.tar.gz
nixpkgs-3753dfe6a9d6c325e53622baf26202f5bc48a08e.tar.bz2
nixpkgs-3753dfe6a9d6c325e53622baf26202f5bc48a08e.tar.lz
nixpkgs-3753dfe6a9d6c325e53622baf26202f5bc48a08e.tar.xz
nixpkgs-3753dfe6a9d6c325e53622baf26202f5bc48a08e.tar.zst
nixpkgs-3753dfe6a9d6c325e53622baf26202f5bc48a08e.zip
network_cmds: unconditionally exclude Unbound
This fixes build failures caused by LibreSSL 3.4 being marked insecure
and allows it to be dropped from nixpkgs. Unbound is already not built
on aarch64-darwin, and it is not bundled with newer source releases.

Packages that require Unbound should depend on `unbound` from nixpkgs
instead of getting it indirectly from `darwin.network_cmds`.
Diffstat (limited to 'pkgs/os-specific/darwin/apple-source-releases')
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix10
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 367c0f50d03..600571f2225 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 */," ""
   '';