ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-13 21:32:23 +03:00
Code Issues Projects Releases Wiki Activity

add libutil into darwin.Libsystem

Browse Source
This commit is contained in:
Jude Taylor 2015-11-04 10:49:13 -08:00
parent d2e6b9f3ae
commit 7161be03c4
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, appleDerivation, cpio, bootstrap_cmds, xnu, Libc, Libm, libdispatch, cctools, Libinfo,
dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto, copyfile,
removefile, libresolv, Libnotify, libpthread, mDNSResponder, launchd, version }:
removefile, libresolv, Libnotify, libpthread, mDNSResponder, launchd, libutil, version }:
appleDerivation rec {
phases = [ "unpackPhase" "installPhase" ];
@ -54,7 +54,7 @@ appleDerivation rec {
for dep in ${Libc} ${Libm} ${Libinfo} ${dyld} ${architecture} ${libclosure} ${CarbonHeaders} \
${libdispatch} ${ncurses} ${CommonCrypto} ${copyfile} ${removefile} ${libresolv} \
${Libnotify} ${mDNSResponder} ${launchd}; do
${Libnotify} ${mDNSResponder} ${launchd} ${libutil}; do
(cd $dep/include && find . -name '*.h' | cpio -pdm $out/include)
done
@ -120,7 +120,7 @@ appleDerivation rec {
(map (l: "-reexport_library /usr/lib/system/lib${l}.dylib") systemlibs)}
# Set up links to pretend we work like a conventional unix (Apple's design, not mine!)
for name in c dbm dl info m mx poll proc pthread rpcsvc gcc_s.10.4 gcc_s.10.5; do
for name in c dbm dl info m mx poll proc pthread rpcsvc util gcc_s.10.4 gcc_s.10.5; do
ln -s libSystem.dylib $out/lib/lib$name.dylib
done
@ -136,8 +136,6 @@ appleDerivation rec {
-delete_rpath ${libresolv}/lib \
$out/lib/libresolv.9.dylib
ln -s libresolv.9.dylib $out/lib/libresolv.dylib
otool -L $out/lib/libresolv.dylib
'';
meta = with stdenv.lib; {

2
pkgs/os-specific/darwin/apple-source-releases/default.nix
View File

@ -76,7 +76,7 @@ let
libpthread = applePackage "libpthread" "105.1.4" "09vwwahcvmxvx2xl0890gkp91n61dld29j73y2pa597bqkag2qpg" {};
libresolv = applePackage "libresolv" "54" "028mp2smd744ryxwl8cqz4njv8h540sdw3an1yl7yxqcs04r0p4b" {};
Libsystem = applePackage "Libsystem" "1197.1.1" "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" {};
#libutil = applePackage "libutil" "38" "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {};
libutil = applePackage "libutil" "38" "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {};
libunwind = applePackage "libunwind" "35.3" "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {};
mDNSResponder = applePackage "mDNSResponder" "522.92.1" "1cp87qda1s7brriv413i71yggm8yqfwv64vknrnqv24fcb8hzbmy" {};
objc4 = applePackage "objc4" "551.1" "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {};

17
pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix Normal file
View File

@ -0,0 +1,17 @@
{ stdenv, appleDerivation }:
# all symbols are located in libSystem
appleDerivation {
phases = [ "unpackPhase" "installPhase" ];
installPhase = ''
mkdir -p $out/include
cp *.h $out/include
'';
meta = with stdenv.lib; {
maintainers = with maintainers; [ copumpkin ];
platforms = platforms.darwin;
license = licenses.apsl20;
};
}