public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '6389f9b' (was in staging)

Browse Source
This commit is contained in:
obadz 2016-08-30 02:31:59 +01:00
commit e7b2f05d20
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/stdenv/darwin/make-bootstrap-tools.nix
View File

@ -2,9 +2,7 @@
with import ../../.. { inherit system; }; with import ../../.. { inherit system; };
let rec {
llvmPackages = llvmPackages_38;
in rec {
coreutils_ = coreutils.override (args: { coreutils_ = coreutils.override (args: {
# We want coreutils without ACL support. # We want coreutils without ACL support.
aclSupport = false; aclSupport = false;
@ -80,11 +78,11 @@ in rec {
cp -rL ${llvmPackages.clang-unwrapped}/lib/clang $out/lib cp -rL ${llvmPackages.clang-unwrapped}/lib/clang $out/lib
cp -d ${llvmPackages.libcxx}/lib/libc++*.dylib $out/lib cp -d ${libcxx}/lib/libc++*.dylib $out/lib
cp -d ${llvmPackages.libcxxabi}/lib/libc++abi*.dylib $out/lib cp -d ${libcxxabi}/lib/libc++abi*.dylib $out/lib
mkdir $out/include mkdir $out/include
cp -rd ${llvmPackages.libcxx}/include/c++ $out/include cp -rd ${libcxx}/include/c++ $out/include
cp -d ${icu.out}/lib/libicu*.dylib $out/lib cp -d ${icu.out}/lib/libicu*.dylib $out/lib
cp -d ${zlib.out}/lib/libz.* $out/lib cp -d ${zlib.out}/lib/libz.* $out/lib