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

Merge pull request #41946 from obsidiansystems/darwin-booting-llvm 

darwin stdenv: fix llvmPackages overrides
This commit is contained in:
John Ericson 2018-06-13 17:02:18 -04:00 committed by GitHub
parent 45c70e496f d7895c2810
commit bce38f4887
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/stdenv/darwin/default.nix
View File

@ -275,10 +275,9 @@ in rec {
libcxxabi libcxx ncurses libffi zlib gmp pcre gnugrep libcxxabi libcxx ncurses libffi zlib gmp pcre gnugrep
coreutils findutils diffutils patchutils; coreutils findutils diffutils patchutils;
llvmPackages = let llvmOverride = llvmPackages.llvm.override { inherit libcxxabi; }; llvmPackages_5 = super.llvmPackages_5 // {
in super.llvmPackages // { llvm = llvmPackages_5.llvm.override { inherit libcxxabi; };
llvm = llvmOverride; clang-unwrapped = llvmPackages_5.clang-unwrapped.override { llvm = self.llvmPackages_5.llvm; };
clang-unwrapped = llvmPackages.clang-unwrapped.override { llvm = llvmOverride; };
}; };
darwin = super.darwin // { darwin = super.darwin // {
@ -314,8 +313,8 @@ in rec {
libcxxabi libcxx ncurses libffi zlib llvm gmp pcre gnugrep libcxxabi libcxx ncurses libffi zlib llvm gmp pcre gnugrep
coreutils findutils diffutils patchutils; coreutils findutils diffutils patchutils;
llvmPackages = super.llvmPackages // { llvmPackages_5 = super.llvmPackages_5 // {
inherit (llvmPackages) llvm clang-unwrapped; inherit (llvmPackages_5) llvm clang-unwrapped;
}; };
darwin = super.darwin // { darwin = super.darwin // {