diff options
author | Jude Taylor <me@jude.bio> | 2015-11-04 10:49:13 -0800 |
---|---|---|
committer | Jude Taylor <me@jude.bio> | 2015-11-04 10:49:19 -0800 |
commit | 7161be03c4af3b113c87eed68117486795fc3c6a (patch) | |
tree | 99134261b3709f6ac641e086f74d4f900894a6d9 /pkgs/os-specific | |
parent | d2e6b9f3ae5d4168ebe7ff92371ac09bdc2fcfe5 (diff) | |
download | nixpkgs-7161be03c4af3b113c87eed68117486795fc3c6a.tar nixpkgs-7161be03c4af3b113c87eed68117486795fc3c6a.tar.gz nixpkgs-7161be03c4af3b113c87eed68117486795fc3c6a.tar.bz2 nixpkgs-7161be03c4af3b113c87eed68117486795fc3c6a.tar.lz nixpkgs-7161be03c4af3b113c87eed68117486795fc3c6a.tar.xz nixpkgs-7161be03c4af3b113c87eed68117486795fc3c6a.tar.zst nixpkgs-7161be03c4af3b113c87eed68117486795fc3c6a.zip |
add libutil into darwin.Libsystem
Diffstat (limited to 'pkgs/os-specific')
3 files changed, 21 insertions, 6 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 108b430d783..95c1ca73e51 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -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; { diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 43698629a46..906e0ad2d54 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -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" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix new file mode 100644 index 00000000000..c943c2068e6 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix @@ -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; + }; +} |