pyrox.dev
lol
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
+4
-6
pkgs/stdenv/darwin/make-bootstrap-tools.nix
+4
-6
pkgs/stdenv/darwin/make-bootstrap-tools.nix
···
2
2
3
3
with import ../../.. { inherit system; };
4
4
5
-
let
6
-
llvmPackages = llvmPackages_38;
7
-
in rec {
5
+
rec {
8
6
coreutils_ = coreutils.override (args: {
9
7
# We want coreutils without ACL support.
10
8
aclSupport = false;
···
80
78
81
79
cp -rL ${llvmPackages.clang-unwrapped}/lib/clang $out/lib
82
80
83
-
cp -d ${llvmPackages.libcxx}/lib/libc++*.dylib $out/lib
84
-
cp -d ${llvmPackages.libcxxabi}/lib/libc++abi*.dylib $out/lib
81
+
cp -d ${libcxx}/lib/libc++*.dylib $out/lib
82
+
cp -d ${libcxxabi}/lib/libc++abi*.dylib $out/lib
85
83
86
84
mkdir $out/include
87
-
cp -rd ${llvmPackages.libcxx}/include/c++ $out/include
85
+
cp -rd ${libcxx}/include/c++ $out/include
88
86
89
87
cp -d ${icu.out}/lib/libicu*.dylib $out/lib
90
88
cp -d ${zlib.out}/lib/libz.* $out/lib