tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
darwin.libdispatch: 442.1.4 -> 703.50.37
Randy Eckenrode
2 years ago
baf3568f
4ee4fe5f
+15
-10
3 changed files
expand all
collapse all
unified
split
pkgs
os-specific
darwin
apple-source-releases
Libsystem
headers.txt
default.nix
libdispatch
default.nix
-2
pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt
···
1053
1053
os/trace.h
1054
1054
os/tsd.h
1055
1055
os_availability.modulemap
1056
1056
-
os/voucher_activity_private.h
1057
1057
-
os/voucher_private.h
1058
1056
osfmk/UserNotification/KUNCUserNotifications.h
1059
1057
osfmk/UserNotification/UNDReply.defs
1060
1058
osfmk/UserNotification/UNDRequest.defs
+4
-1
pkgs/os-specific/darwin/apple-source-releases/default.nix
···
39
39
libpthread = "218.60.3";
40
40
hfs = "366.70.1";
41
41
};
42
42
+
"osx-10.12.4" = {
43
43
+
libdispatch = "703.50.37";
44
44
+
};
42
45
"osx-10.11.6" = {
43
46
PowerManagement = "572.50.1";
44
47
dtrace = "168";
···
275
278
};
276
279
};
277
280
libclosure = applePackage "libclosure" "osx-10.11.6" "sha256-L5rQ+UBpf3B+W1U+gZKk7fXulslHsc8lxnCsplV+nr0=" {};
278
278
-
libdispatch = applePackage "libdispatch" "osx-10.10.5" "sha256-jfAEk0OLrJa9AIZVikIoHomd+l+4rCfc320Xh50qK5M=" {};
281
281
+
libdispatch = applePackage "libdispatch" "osx-10.12.4" "sha256-xUqoG5JK4P3nXeoVUOBzodVK9fjH/I3xJ6WRtM39bdw=" {};
279
282
Libinfo = applePackage "Libinfo" "osx-10.11.6" "sha256-6F7wiwerv4nz/xXHtp1qCHSaFzZgzcRN+jbmXA5oWOQ=" {};
280
283
Libm = applePackage "Libm" "osx-10.7.4" "sha256-KjMETfT4qJm0m0Ux/F6Rq8bI4Q4UVnFx6IKbKxXd+Es=" {};
281
284
Libnotify = applePackage "Libnotify" "osx-10.12.6" "sha256-6wvMBxAUfiYcQtmlfYCj1d3kFmFM/jdboTd7hRvi3e4=" {};
+11
-7
pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
···
1
1
-
{ appleDerivation', stdenvNoCC }:
1
1
+
{ lib, appleDerivation', stdenvNoCC }:
2
2
3
3
-
appleDerivation' stdenvNoCC {
3
3
+
appleDerivation' stdenvNoCC (finalAttrs: {
4
4
dontConfigure = true;
5
5
dontBuild = true;
6
6
installPhase = ''
7
7
mkdir -p $out/include/dispatch $out/include/os
8
8
9
9
# Move these headers so CF can find <os/voucher_private.h>
10
10
-
mv private/voucher*.h $out/include/os
11
10
cp -r private/*.h $out/include/dispatch
12
11
13
12
cp -r dispatch/*.h $out/include/dispatch
···
15
14
16
15
# gcc compatibility. Source: https://stackoverflow.com/a/28014302/3714556
17
16
substituteInPlace $out/include/dispatch/object.h \
18
18
-
--replace 'typedef void (^dispatch_block_t)(void);' \
17
17
+
--replace-fail 'typedef void (^dispatch_block_t)(void);' \
19
18
'#ifdef __clang__
20
19
typedef void (^dispatch_block_t)(void);
21
20
#else
···
46
45
dispatch/source.h
47
46
dispatch/source_private.h
48
47
dispatch/time.h
48
48
+
''
49
49
+
+ lib.optionalString (lib.versionAtLeast "1271.40.12" finalAttrs.version) ''
50
50
+
dispatch/time_private.h
51
51
+
dispatch/workloop.h
52
52
+
dispatch/workloop_private.h
53
53
+
''
54
54
+
+ ''
49
55
os/object.h
50
56
os/object_private.h
51
51
-
os/voucher_activity_private.h
52
52
-
os/voucher_private.h
53
57
'';
54
54
-
}
58
58
+
})