Unverified Commit 7b23be1a authored by Randy Eckenrode's avatar Randy Eckenrode
Browse files

darwin.libpthread: remove and replace with stubs

parent 29f65b3b

pkgs/os-specific/darwin/apple-source-releases/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -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=" {};

pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
{ 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;

  };

}

pkgs/os-specific/darwin/apple-source-releases/macos-11.0.1.nix

+0 −1
Original line number Diff line number Diff line
@@ -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" {};

pkgs/top-level/darwin-packages.nix

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ makeScopeWithSplicing' { 
    "libdispatch"

    "libmalloc"

    "libplatform"

    "libpthread"

  ] (mkStub apple_sdk.version);

in

impure-cmds // appleSourcePackages // stubs // {