Unverified Commit 29f65b3b authored by Randy Eckenrode's avatar Randy Eckenrode
Browse files

darwin.libplatform: remove and replace with stubs

parent 1afb8b56

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

+0 −3
Original line number Diff line number Diff line
@@ -262,9 +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 { };

    libplatform     = if isSdk10_12 then

      applePackage "libplatform"       "osx-10.12.6"     "sha256-6McMTjw55xtnCsFI3AB1osRagnuB5pSTqeMKD3gpGtM=" {}

    else macosPackages_11_0_1.libplatform;

    libpthread      = applePackage "libpthread"        "osx-10.12.6"     "sha256-QvJ9PERmrCWBiDmOWrLvQUKZ4JxHuh8gS5nlZKDLqE8=" {};

    libresolv       = callPackage ./libresolv/package.nix { };

    libutil         = callPackage ./libutil/package.nix { };

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

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
{ lib, appleDerivation', stdenvNoCC }:



appleDerivation' stdenvNoCC (finalAttrs: {

  installPhase = ''

    mkdir $out

    cp -r include $out/include

    test -d private && cp -r private/* $out/include

  '';



  appleHeaders = ''

    _simple.h

    libkern/OSAtomic.h

    libkern/OSAtomicDeprecated.h

    libkern/OSAtomicQueue.h

    libkern/OSCacheControl.h

    libkern/OSSpinLockDeprecated.h

    os/alloc_once_impl.h

    os/base.h

    os/base_private.h

    os/internal/atomic.h

    os/internal/crashlog.h

    os/internal/internal_shared.h

    os/lock.h

    os/lock_private.h

    os/once_private.h

    os/semaphore_private.h

    platform/compat.h

    platform/introspection_private.h

    platform/string.h

    setjmp.h

  '' + (

    if lib.versionAtLeast finalAttrs.version "254.40.4" then ''

      string_x86.h

      ucontext.h

    '' else ''

      ucontext.h

    ''

  );

})

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" {};

libplatform = applePackage' "libplatform" "254.40.4" "macos-11.0.1" "1qf3ri0yd8b1xjln1j1gyx7ks6k3a2jhd63blyvfby75y9s7flky" {};

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" {};

pkgs/top-level/darwin-packages.nix

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

    "libdispatch"

    "libmalloc"

    "libplatform"

  ] (mkStub apple_sdk.version);

in

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