summary refs log tree commit diff
path: root/pkgs/os-specific/darwin
diff options
context:
space:
mode:
authorDan Peebles <pumpkin@me.com>2016-08-14 17:34:55 -0400
committerDan Peebles <pumpkin@me.com>2016-08-14 17:34:55 -0400
commit98b5e3a531a5f560314104ceecb730e59fc78a58 (patch)
tree226565a315e37dbbe645a3b012db9b368e10f023 /pkgs/os-specific/darwin
parent8f4bbdce99938bc9387f9d9e9a6a8d8b2d1cc34f (diff)
downloadnixpkgs-98b5e3a531a5f560314104ceecb730e59fc78a58.tar
nixpkgs-98b5e3a531a5f560314104ceecb730e59fc78a58.tar.gz
nixpkgs-98b5e3a531a5f560314104ceecb730e59fc78a58.tar.bz2
nixpkgs-98b5e3a531a5f560314104ceecb730e59fc78a58.tar.lz
nixpkgs-98b5e3a531a5f560314104ceecb730e59fc78a58.tar.xz
nixpkgs-98b5e3a531a5f560314104ceecb730e59fc78a58.tar.zst
nixpkgs-98b5e3a531a5f560314104ceecb730e59fc78a58.zip
darwin.libpthread: fix messed-up header
We don't actually need the private headers and the private qos.h was
overwriting the public one, causing weird issues downstream (especially
with Swift's CoreFoundation)
Diffstat (limited to 'pkgs/os-specific/darwin')
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix
index 50794814aa0..c9d4b654a58 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix
@@ -9,9 +9,11 @@ appleDerivation {
     mkdir -p $out/include/pthread/
     mkdir -p $out/include/sys/_types
     cp pthread/*.h $out/include/pthread/
-    cp private/*.h $out/include/pthread/
+
+    # This overwrites qos.h, and is probably not necessary, but I'll leave it here for now
+    # cp private/*.h $out/include/pthread/
+
     cp -r sys $out/include
     cp -r sys/_pthread/*.h $out/include/sys/_types/
-
   '';
 }