From 7b23be1afd0e60e5ca0522f8ecd7ee6ab6000cf1 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 2 Sep 2024 19:27:03 -0400 Subject: [PATCH] darwin.libpthread: remove and replace with stubs --- .../darwin/apple-source-releases/default.nix | 1 - .../libpthread/default.nix | 55 ------------------- .../apple-source-releases/macos-11.0.1.nix | 1 - pkgs/top-level/darwin-packages.nix | 1 + 4 files changed, 1 insertion(+), 57 deletions(-) delete mode 100644 pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 72ce6fd4a96d..1489d4224c85 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -262,7 +262,6 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { AvailabilityVersions = callPackage ./AvailabilityVersions/package.nix { }; copyfile = callPackage ./copyfile/package.nix { }; Csu = callPackage ./Csu/package.nix { }; - libpthread = applePackage "libpthread" "osx-10.12.6" "sha256-QvJ9PERmrCWBiDmOWrLvQUKZ4JxHuh8gS5nlZKDLqE8=" {}; libresolv = callPackage ./libresolv/package.nix { }; libutil = callPackage ./libutil/package.nix { }; libunwind = applePackage "libunwind" "osx-10.12.6" "sha256-CC0sndP/mKYe3dZu3v7fjuDASV4V4w7dAcnWMvpoquE=" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix deleted file mode 100644 index 3d62270d76c0..000000000000 --- a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, appleDerivation', stdenvNoCC, libdispatch, xnu }: - -appleDerivation' stdenvNoCC { - propagatedBuildInputs = [ libdispatch xnu ]; - - installPhase = '' - mkdir -p $out/include/pthread/ - mkdir -p $out/include/sys/_types - cp pthread/*.h $out/include/pthread/ - - # This overwrites qos.h, and is probably not necessary, but I'll leave it here for now - # cp private/*.h $out/include/pthread/ - - cp -r sys $out/include - cp -r sys/_pthread/*.h $out/include/sys/_types/ - ''; - - appleHeaders = '' - pthread/introspection.h - pthread/pthread.h - pthread/pthread_impl.h - pthread/pthread_spis.h - pthread/qos.h - pthread/sched.h - pthread/spawn.h - sys/_pthread/_pthread_attr_t.h - sys/_pthread/_pthread_cond_t.h - sys/_pthread/_pthread_condattr_t.h - sys/_pthread/_pthread_key_t.h - sys/_pthread/_pthread_mutex_t.h - sys/_pthread/_pthread_mutexattr_t.h - sys/_pthread/_pthread_once_t.h - sys/_pthread/_pthread_rwlock_t.h - sys/_pthread/_pthread_rwlockattr_t.h - sys/_pthread/_pthread_t.h - sys/_pthread/_pthread_types.h - sys/_types/_pthread_attr_t.h - sys/_types/_pthread_cond_t.h - sys/_types/_pthread_condattr_t.h - sys/_types/_pthread_key_t.h - sys/_types/_pthread_mutex_t.h - sys/_types/_pthread_mutexattr_t.h - sys/_types/_pthread_once_t.h - sys/_types/_pthread_rwlock_t.h - sys/_types/_pthread_rwlockattr_t.h - sys/_types/_pthread_t.h - sys/_types/_pthread_types.h - sys/qos.h - sys/qos_private.h - ''; - - meta = { - platforms = lib.platforms.darwin; - }; -} diff --git a/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix b/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix index ed85e7671758..c3133b0d60c6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix @@ -12,7 +12,6 @@ bootstrap_cmds = callPackage ./bootstrap_cmds/package.nix { }; copyfile = applePackage' "copyfile" "173.40.2" "macos-11.0.1" "1j20909inn2iw8n51b8vk551wznfi3bhfziy8nbv08qj5lk50m04" {}; diskdev_cmds = applePackage' "diskdev_cmds" "667.40.1" "macos-11.0.1" "0wr60vyvgkbc4wyldnsqas0xss2k1fgmbdk3vnhj6v6jqa98l1ny" {}; file_cmds = applePackage' "file_cmds" "321.40.3" "macos-11.0.1" "0p077lnbcy8266m03a0fssj4214bjxh88y3qkspnzcvi0g84k43q" {}; -libpthread = applePackage' "libpthread" "454.40.3" "macos-11.0.1" "0zljbw8mpb80n1if65hhi9lkgwbgjr8vc9wvf7q1nl3mzyl35f8p" {}; libresolv = applePackage' "libresolv" "68" "macos-11.0.1" "045ahh8nvaam9whryc2f5g5xagwp7d187r80kcff82snp5p66aq1" {}; libunwind = applePackage' "libunwind" "200.10" "macos-11.0.1" "0wa4ssr7skn5j0ncm1rigd56qmbs982zvwr3qpjn28krwp8wvigd" {}; libutil = applePackage' "libutil" "58.40.2" "macos-11.0.1" "11s0vizk7bg0k0yjx21j8vaji4j4vk57131qbp07i9lpksb3bcy4" {}; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 024f7904f365..693742fd952f 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -95,6 +95,7 @@ makeScopeWithSplicing' { "libdispatch" "libmalloc" "libplatform" + "libpthread" ] (mkStub apple_sdk.version); in impure-cmds // appleSourcePackages // stubs // {