summary refs log tree commit diff
path: root/pkgs/os-specific/darwin/apple-source-releases/libpthread
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2016-08-15 19:05:52 -0400
committerShea Levy <shea@shealevy.com>2016-08-15 19:05:52 -0400
commit9adad8612b082bcbae30c81678a04b79a44079a4 (patch)
tree6814d056ee2960d122842dc9c830bb411c40d5ff /pkgs/os-specific/darwin/apple-source-releases/libpthread
parent57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1 (diff)
downloadnixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar
nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar.gz
nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar.bz2
nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar.lz
nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar.xz
nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.tar.zst
nixpkgs-9adad8612b082bcbae30c81678a04b79a44079a4.zip
Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"
Was meant to go into staging, sorry

This reverts commit 57b2d1e9b0dcdd1d25bd2d450174764b9417ffc1, reversing
changes made to 760b2b9048ea775c319cb348d74447a20dea513e.
Diffstat (limited to 'pkgs/os-specific/darwin/apple-source-releases/libpthread')
-rw-r--r--pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix10
1 files changed, 2 insertions, 8 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 c9d4b654a58..027784e2ea6 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix
@@ -6,14 +6,8 @@ appleDerivation {
   propagatedBuildInputs = [ libdispatch xnu ];
 
   installPhase = ''
-    mkdir -p $out/include/pthread/
-    mkdir -p $out/include/sys/_types
+    mkdir -p $out/include/pthread
     cp pthread/*.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/
+    cp private/*.h $out/include/pthread/
   '';
 }