summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2017-05-24 01:13:20 +0200
committerDaiderd Jordan <daiderd@gmail.com>2017-05-27 23:19:48 +0200
commitbf58495177670f76582a8a2afb8888af3815232f (patch)
tree5950857d3cb5b0c50fdb188c6058f6e330fe7ef7
parent857648dd31281c166aaada04145dd3301da74350 (diff)
downloadnixpkgs-bf58495177670f76582a8a2afb8888af3815232f.tar
nixpkgs-bf58495177670f76582a8a2afb8888af3815232f.tar.gz
nixpkgs-bf58495177670f76582a8a2afb8888af3815232f.tar.bz2
nixpkgs-bf58495177670f76582a8a2afb8888af3815232f.tar.lz
nixpkgs-bf58495177670f76582a8a2afb8888af3815232f.tar.xz
nixpkgs-bf58495177670f76582a8a2afb8888af3815232f.tar.zst
nixpkgs-bf58495177670f76582a8a2afb8888af3815232f.zip
darwin-dispatch: 339.92.1 -> 442.1.4
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/default.nix4
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix5
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index b77ca8cea32..2182528e74d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -49,6 +49,7 @@ let
     "osx-10.10.5" = {
       adv_cmds      = "158";
       ICU           = "531.48";
+      libdispatch   = "442.1.4";
       Security      = "57031.40.6";
 
       IOAudioFamily                        = "203.3";
@@ -72,7 +73,6 @@ let
       launchd            = "842.92.1";
       libauto            = "185.5";
       Libc               = "997.90.3"; # We use this, but not from here
-      libdispatch        = "339.92.1";
       Libsystem          = "1197.1.1";
       Security           = "55471.14.18";
       security_dotmac_tp = "55107.1";
@@ -211,7 +211,7 @@ let
     };
     Libc_old        = applePackage "Libc/825_40_1.nix" "osx-10.8.5"      "0xsx1im52gwlmcrv4lnhhhn9dyk5ci6g27k6yvibn9vj8fzjxwcf" {};
     libclosure      = applePackage "libclosure"        "osx-10.11.6"     "1zqy1zvra46cmqv6vsf1mcsz3a76r9bky145phfwh4ab6y15vjpq" {};
-    libdispatch     = applePackage "libdispatch"       "osx-10.9.5"      "1lc5033cmkwxy3r26gh9plimxshxfcbgw6i0j7mgjlnpk86iy5bk" {};
+    libdispatch     = applePackage "libdispatch"       "osx-10.10.5"     "0jsfbzp87lwk9snlby0hd4zvj7j894p5q3cw0wdx9ny1mcp3kdcj" {};
     libiconv        = applePackage "libiconv"          "osx-10.11.6"     "11h6lfajydri4widis62q8scyz7z8l6msqyx40ly4ahsdlbl0981" {};
     Libinfo         = applePackage "Libinfo"           "osx-10.11.6"     "0qjgkd4y8sjvwjzv5wwyzkb61pg8wwg95bkp721dgzv119dqhr8x" {};
     Libm            = applePackage "Libm"              "osx-10.7.4"      "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {};
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
index fe65e290717..c80e3757569 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
@@ -6,8 +6,11 @@ appleDerivation {
   installPhase = ''
     mkdir -p $out/include/dispatch $out/include/os
 
-    cp -r dispatch/*.h $out/include/dispatch
+    # 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
     cp -r os/object*.h  $out/include/os
   '';
 }