mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-21 12:23:55 +00:00
darwin.libdispatch: remove and replace with stubs
This commit is contained in:
parent
eb7c5f87a3
commit
b9005e19b0
@ -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 { };
|
||||
libdispatch = applePackage "libdispatch" "osx-10.12.4" "sha256-xUqoG5JK4P3nXeoVUOBzodVK9fjH/I3xJ6WRtM39bdw=" {};
|
||||
libmalloc = if isSdk10_12 then
|
||||
applePackage "libmalloc" "osx-10.12.6" "sha256-brfG4GEF2yZipKdhlPq6DhT2z5hKYSb2MAmffaikdO4=" {}
|
||||
else macosPackages_11_0_1.libmalloc;
|
||||
|
@ -1,58 +0,0 @@
|
||||
{ lib, appleDerivation', stdenvNoCC }:
|
||||
|
||||
appleDerivation' stdenvNoCC (finalAttrs: {
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
installPhase = ''
|
||||
mkdir -p $out/include/dispatch $out/include/os
|
||||
|
||||
# Move these headers so CF can find <os/voucher_private.h>
|
||||
cp -r private/*.h $out/include/dispatch
|
||||
|
||||
cp -r dispatch/*.h $out/include/dispatch
|
||||
cp -r os/object*.h $out/include/os
|
||||
|
||||
# gcc compatibility. Source: https://stackoverflow.com/a/28014302/3714556
|
||||
substituteInPlace $out/include/dispatch/object.h \
|
||||
--replace-fail 'typedef void (^dispatch_block_t)(void);' \
|
||||
'#ifdef __clang__
|
||||
typedef void (^dispatch_block_t)(void);
|
||||
#else
|
||||
typedef void* dispatch_block_t;
|
||||
#endif'
|
||||
'';
|
||||
|
||||
appleHeaders = ''
|
||||
dispatch/base.h
|
||||
dispatch/benchmark.h
|
||||
dispatch/block.h
|
||||
dispatch/data.h
|
||||
dispatch/data_private.h
|
||||
dispatch/dispatch.h
|
||||
dispatch/group.h
|
||||
dispatch/introspection.h
|
||||
dispatch/introspection_private.h
|
||||
dispatch/io.h
|
||||
dispatch/io_private.h
|
||||
dispatch/layout_private.h
|
||||
dispatch/mach_private.h
|
||||
dispatch/object.h
|
||||
dispatch/once.h
|
||||
dispatch/private.h
|
||||
dispatch/queue.h
|
||||
dispatch/queue_private.h
|
||||
dispatch/semaphore.h
|
||||
dispatch/source.h
|
||||
dispatch/source_private.h
|
||||
dispatch/time.h
|
||||
''
|
||||
+ lib.optionalString (lib.versionAtLeast "1271.40.12" finalAttrs.version) ''
|
||||
dispatch/time_private.h
|
||||
dispatch/workloop.h
|
||||
dispatch/workloop_private.h
|
||||
''
|
||||
+ ''
|
||||
os/object.h
|
||||
os/object_private.h
|
||||
'';
|
||||
})
|
@ -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" {};
|
||||
libdispatch = applePackage' "libdispatch" "1271.40.12" "macos-11.0.1" "1ck5srcjapg18vqb8wl08gacs7ndc6xr067qjn3ngx39q1jdcywz" {};
|
||||
libmalloc = applePackage' "libmalloc" "317.40.8" "macos-11.0.1" "sha256-Tdhb0mq3w4Hwvp3xHB79Vr22hCOQK6h28HCsd7jvITI=" {};
|
||||
libplatform = applePackage' "libplatform" "254.40.4" "macos-11.0.1" "1qf3ri0yd8b1xjln1j1gyx7ks6k3a2jhd63blyvfby75y9s7flky" {};
|
||||
libpthread = applePackage' "libpthread" "454.40.3" "macos-11.0.1" "0zljbw8mpb80n1if65hhi9lkgwbgjr8vc9wvf7q1nl3mzyl35f8p" {};
|
||||
|
@ -92,6 +92,7 @@ makeScopeWithSplicing' {
|
||||
"hfsHeaders"
|
||||
"launchd"
|
||||
"libclosure"
|
||||
"libdispatch"
|
||||
] (mkStub apple_sdk.version);
|
||||
in
|
||||
impure-cmds // appleSourcePackages // stubs // {
|
||||
|
Loading…
Reference in New Issue
Block a user