diff options
| author | Shea Levy <shea@shealevy.com> | 2016-08-24 07:35:30 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2016-08-24 07:35:30 -0400 |
| commit | 8b9b9fad3145a5460ce390ac1c155a5073b9bf65 (patch) | |
| tree | d83d54fe8bc58e6977c0cc7f991f0a01d5dc53d3 /pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix | |
| parent | 78b7529ee36603182ae34354d7cbc3dcfc228317 (diff) | |
| download | nixpkgs-8b9b9fad3145a5460ce390ac1c155a5073b9bf65.tar nixpkgs-8b9b9fad3145a5460ce390ac1c155a5073b9bf65.tar.gz nixpkgs-8b9b9fad3145a5460ce390ac1c155a5073b9bf65.tar.bz2 nixpkgs-8b9b9fad3145a5460ce390ac1c155a5073b9bf65.tar.lz nixpkgs-8b9b9fad3145a5460ce390ac1c155a5073b9bf65.tar.xz nixpkgs-8b9b9fad3145a5460ce390ac1c155a5073b9bf65.tar.zst nixpkgs-8b9b9fad3145a5460ce390ac1c155a5073b9bf65.zip | |
Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs""
Revert a revert of a merge that shouldn't have been in master but was intentionally in staging. Next time I'll do this right after the revert instead of so far down the line... This reverts commit 9adad8612b082bcbae30c81678a04b79a44079a4.
Diffstat (limited to 'pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix')
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix index 16cfa9e554b..ce04be0e083 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, appleDerivation, ed, unifdef, Libc_old }: +{ stdenv, appleDerivation, ed, unifdef, Libc_old, Libc_10-9 }: appleDerivation { phases = [ "unpackPhase" "installPhase" ]; @@ -13,6 +13,8 @@ appleDerivation { export PRIVATE_HEADERS_FOLDER_PATH=include bash xcodescripts/headers.sh + cp ${Libc_10-9}/include/NSSystemDirectories.h $out/include + # Ugh Apple stopped releasing this stuff so we need an older one... cp ${Libc_old}/include/spawn.h $out/include cp ${Libc_old}/include/setjmp.h $out/include |