From 52b8b68e8235f496e6bb972ae36e30bd8946a633 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 22 Jun 2018 13:52:33 +0200
Subject: [PATCH 1/3] Libsystem: remove libsystem_network.dylib from reexport
 list

Fixes #42719
---
 .../apple-source-releases/Libsystem/reexported_libraries      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries
index 494426eba6d..edc2e759a29 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries
@@ -19,7 +19,7 @@
 
 /usr/lib/system/libsystem_configuration.dylib
 /usr/lib/system/libsystem_coreservices.dylib
-# /usr/lib/system/libsystem_coretls.dylib # Removed in 10.13
+# /usr/lib/system/libsystem_coretls.dylib  # Removed in 10.13
 /usr/lib/system/libsystem_dnssd.dylib
 /usr/lib/system/libsystem_info.dylib
 
@@ -28,7 +28,7 @@
 
 /usr/lib/system/libsystem_m.dylib
 /usr/lib/system/libsystem_malloc.dylib
-/usr/lib/system/libsystem_network.dylib
+# /usr/lib/system/libsystem_network.dylib  # Removed in 10.14
 /usr/lib/system/libsystem_networkextension.dylib
 /usr/lib/system/libsystem_notify.dylib
 /usr/lib/system/libsystem_platform.dylib

From 5024e4aa39d6d2ddfe52ee481f7a1f728d5b8d1e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 5 Jul 2018 19:24:07 +0200
Subject: [PATCH 2/3] stdenv-bootstrap-tools: update unpack to use
 $reexportedLibrariesFile

---
 pkgs/stdenv/darwin/make-bootstrap-tools.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 6fc9d7f0c10..66c5f419f2f 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -178,6 +178,9 @@ in rec {
   unpack = stdenv.mkDerivation (bootstrapFiles // {
     name = "unpack";
 
+    reexportedLibrariesFile =
+      ../../os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries;
+
     # This is by necessity a near-duplicate of unpack-bootstrap-tools.sh. If we refer to it directly,
     # we can't make any changes to it due to our testing stdenv depending on it. Think of this as the
     # unpack-bootstrap-tools.sh for the next round of bootstrap tools.
@@ -209,7 +212,7 @@ in rec {
         $out/lib/system/libsystem_kernel.dylib
 
       # TODO: this logic basically duplicates similar logic in the Libsystem expression. Deduplicate them!
-      libs=$(otool -arch x86_64 -L /usr/lib/libSystem.dylib | tail -n +3 | awk '{ print $1 }')
+      libs=$(cat $reexportedLibrariesFile | grep -v '^#')
 
       for i in $libs; do
         if [ "$i" != "/usr/lib/system/libsystem_kernel.dylib" ] && [ "$i" != "/usr/lib/system/libsystem_c.dylib" ]; then

From 54f901d346b9df7f4506926160f0f378f0a79129 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 12 Aug 2018 00:32:18 +0200
Subject: [PATCH 3/3] Libsystem: remove version symbols

These no longer exist on 10.14

Fixes #42719
---
 .../darwin/apple-source-releases/Libsystem/system_c_symbols     | 2 --
 .../apple-source-releases/Libsystem/system_kernel_symbols       | 2 --
 2 files changed, 4 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_c_symbols b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_c_symbols
index e298ae47f72..4d83c5cfe9b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_c_symbols
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_c_symbols
@@ -51,8 +51,6 @@ ___bt_setcur
 ___bt_split
 ___bt_sync
 ___buf_free
-___cVersionNumber
-___cVersionString
 ___call_hash
 ___cleanup
 ___cmp_D2A
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols
index 000af8ad7b7..4d1a1f521b0 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols
@@ -57,8 +57,6 @@ ___ioctl
 ___iopolicysys
 ___kdebug_trace
 ___kdebug_trace64
-___kernelVersionNumber
-___kernelVersionString
 ___kill
 ___lchown
 ___libkernel_init