mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-21 03:25:36 +00:00
darwin.libdispatch: 442.1.4 -> 703.50.37
This commit is contained in:
parent
4ee4fe5fe7
commit
baf3568fb2
@ -1053,8 +1053,6 @@ os/semaphore_private.h
|
||||
os/trace.h
|
||||
os/tsd.h
|
||||
os_availability.modulemap
|
||||
os/voucher_activity_private.h
|
||||
os/voucher_private.h
|
||||
osfmk/UserNotification/KUNCUserNotifications.h
|
||||
osfmk/UserNotification/UNDReply.defs
|
||||
osfmk/UserNotification/UNDRequest.defs
|
||||
|
@ -39,6 +39,9 @@ let
|
||||
libpthread = "218.60.3";
|
||||
hfs = "366.70.1";
|
||||
};
|
||||
"osx-10.12.4" = {
|
||||
libdispatch = "703.50.37";
|
||||
};
|
||||
"osx-10.11.6" = {
|
||||
PowerManagement = "572.50.1";
|
||||
dtrace = "168";
|
||||
@ -275,7 +278,7 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // {
|
||||
};
|
||||
};
|
||||
libclosure = applePackage "libclosure" "osx-10.11.6" "sha256-L5rQ+UBpf3B+W1U+gZKk7fXulslHsc8lxnCsplV+nr0=" {};
|
||||
libdispatch = applePackage "libdispatch" "osx-10.10.5" "sha256-jfAEk0OLrJa9AIZVikIoHomd+l+4rCfc320Xh50qK5M=" {};
|
||||
libdispatch = applePackage "libdispatch" "osx-10.12.4" "sha256-xUqoG5JK4P3nXeoVUOBzodVK9fjH/I3xJ6WRtM39bdw=" {};
|
||||
Libinfo = applePackage "Libinfo" "osx-10.11.6" "sha256-6F7wiwerv4nz/xXHtp1qCHSaFzZgzcRN+jbmXA5oWOQ=" {};
|
||||
Libm = applePackage "Libm" "osx-10.7.4" "sha256-KjMETfT4qJm0m0Ux/F6Rq8bI4Q4UVnFx6IKbKxXd+Es=" {};
|
||||
Libnotify = applePackage "Libnotify" "osx-10.12.6" "sha256-6wvMBxAUfiYcQtmlfYCj1d3kFmFM/jdboTd7hRvi3e4=" {};
|
||||
|
@ -1,13 +1,12 @@
|
||||
{ appleDerivation', stdenvNoCC }:
|
||||
{ lib, appleDerivation', stdenvNoCC }:
|
||||
|
||||
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>
|
||||
mv private/voucher*.h $out/include/os
|
||||
cp -r private/*.h $out/include/dispatch
|
||||
|
||||
cp -r dispatch/*.h $out/include/dispatch
|
||||
@ -15,7 +14,7 @@ appleDerivation' stdenvNoCC {
|
||||
|
||||
# gcc compatibility. Source: https://stackoverflow.com/a/28014302/3714556
|
||||
substituteInPlace $out/include/dispatch/object.h \
|
||||
--replace 'typedef void (^dispatch_block_t)(void);' \
|
||||
--replace-fail 'typedef void (^dispatch_block_t)(void);' \
|
||||
'#ifdef __clang__
|
||||
typedef void (^dispatch_block_t)(void);
|
||||
#else
|
||||
@ -46,9 +45,14 @@ appleDerivation' stdenvNoCC {
|
||||
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
|
||||
os/voucher_activity_private.h
|
||||
os/voucher_private.h
|
||||
'';
|
||||
}
|
||||
})
|
||||
|
Loading…
Reference in New Issue
Block a user