diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-29 14:06:45 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-29 16:19:36 +0100 |
| commit | 6389f9b349647221e8d48adee8954a5980349211 (patch) | |
| tree | bb657087b3acc254dd5477b1ee5bd6d42cfdfd82 /pkgs | |
| parent | c527ece0b19458a428f6fcf0d60180b59404e691 (diff) | |
| download | nixlib-6389f9b349647221e8d48adee8954a5980349211.tar nixlib-6389f9b349647221e8d48adee8954a5980349211.tar.gz nixlib-6389f9b349647221e8d48adee8954a5980349211.tar.bz2 nixlib-6389f9b349647221e8d48adee8954a5980349211.tar.lz nixlib-6389f9b349647221e8d48adee8954a5980349211.tar.xz nixlib-6389f9b349647221e8d48adee8954a5980349211.tar.zst nixlib-6389f9b349647221e8d48adee8954a5980349211.zip | |
Revert "make-bootstrap-tools.darwin: upgrade to llvm 3.8"
This reverts commit bddf4e21801d0629b608a8a0a46830c795e35ba4. Trying to fix stdenvBootstrapTools.x86_64-darwin.stdenv cc @copumpkin @domenkozar
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/stdenv/darwin/make-bootstrap-tools.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 7bd9a095a85d..41c94bd16745 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -2,9 +2,7 @@ with import ../../.. { inherit system; }; -let - llvmPackages = llvmPackages_38; -in rec { +rec { coreutils_ = coreutils.override (args: { # We want coreutils without ACL support. aclSupport = false; @@ -80,11 +78,11 @@ in rec { cp -rL ${llvmPackages.clang-unwrapped}/lib/clang $out/lib - cp -d ${llvmPackages.libcxx}/lib/libc++*.dylib $out/lib - cp -d ${llvmPackages.libcxxabi}/lib/libc++abi*.dylib $out/lib + cp -d ${libcxx}/lib/libc++*.dylib $out/lib + cp -d ${libcxxabi}/lib/libc++abi*.dylib $out/lib 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 ${zlib.out}/lib/libz.* $out/lib |