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/stdenv | |
parent | 78b7529ee36603182ae34354d7cbc3dcfc228317 (diff) | |
download | nixlib-8b9b9fad3145a5460ce390ac1c155a5073b9bf65.tar nixlib-8b9b9fad3145a5460ce390ac1c155a5073b9bf65.tar.gz nixlib-8b9b9fad3145a5460ce390ac1c155a5073b9bf65.tar.bz2 nixlib-8b9b9fad3145a5460ce390ac1c155a5073b9bf65.tar.lz nixlib-8b9b9fad3145a5460ce390ac1c155a5073b9bf65.tar.xz nixlib-8b9b9fad3145a5460ce390ac1c155a5073b9bf65.tar.zst nixlib-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/stdenv')
-rw-r--r-- | pkgs/stdenv/darwin/make-bootstrap-tools.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 0216acee659b..7bd9a095a85d 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -29,7 +29,6 @@ in rec { # C standard library stuff cp -d ${darwin.Libsystem}/lib/*.o $out/lib/ cp -d ${darwin.Libsystem}/lib/*.dylib $out/lib/ - cp -d ${darwin.Libsystem}/lib/system/*.dylib $out/lib/ # Resolv is actually a link to another package, so let's copy it properly rm $out/lib/libresolv.9.dylib @@ -93,7 +92,7 @@ in rec { cp -d ${xz.out}/lib/liblzma*.* $out/lib # Copy binutils. - for i in as ld ar ranlib nm strip otool install_name_tool dsymutil; do + for i in as ld ar ranlib nm strip otool install_name_tool dsymutil lipo; do cp ${darwin.cctools}/bin/$i $out/bin done |