diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-06-13 17:02:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-13 17:02:18 -0400 |
| commit | bce38f4887bcea5a6aa4e9a97e9e733d3c73c7dd (patch) | |
| tree | 053c261fd528fc7db66952a28d101b8ebbe7026a | |
| parent | 45c70e496f9cd6cd733bcc6578f353ce304a52d8 (diff) | |
| parent | d7895c2810864934356131ee47de2ba18947c844 (diff) | |
| download | nixlib-bce38f4887bcea5a6aa4e9a97e9e733d3c73c7dd.tar nixlib-bce38f4887bcea5a6aa4e9a97e9e733d3c73c7dd.tar.gz nixlib-bce38f4887bcea5a6aa4e9a97e9e733d3c73c7dd.tar.bz2 nixlib-bce38f4887bcea5a6aa4e9a97e9e733d3c73c7dd.tar.lz nixlib-bce38f4887bcea5a6aa4e9a97e9e733d3c73c7dd.tar.xz nixlib-bce38f4887bcea5a6aa4e9a97e9e733d3c73c7dd.tar.zst nixlib-bce38f4887bcea5a6aa4e9a97e9e733d3c73c7dd.zip | |
Merge pull request #41946 from obsidiansystems/darwin-booting-llvm
darwin stdenv: fix llvmPackages overrides
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 951c96877f96..57b59f26204c 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -275,10 +275,9 @@ in rec { libcxxabi libcxx ncurses libffi zlib gmp pcre gnugrep coreutils findutils diffutils patchutils; - llvmPackages = let llvmOverride = llvmPackages.llvm.override { inherit libcxxabi; }; - in super.llvmPackages // { - llvm = llvmOverride; - clang-unwrapped = llvmPackages.clang-unwrapped.override { llvm = llvmOverride; }; + llvmPackages_5 = super.llvmPackages_5 // { + llvm = llvmPackages_5.llvm.override { inherit libcxxabi; }; + clang-unwrapped = llvmPackages_5.clang-unwrapped.override { llvm = self.llvmPackages_5.llvm; }; }; darwin = super.darwin // { @@ -314,8 +313,8 @@ in rec { libcxxabi libcxx ncurses libffi zlib llvm gmp pcre gnugrep coreutils findutils diffutils patchutils; - llvmPackages = super.llvmPackages // { - inherit (llvmPackages) llvm clang-unwrapped; + llvmPackages_5 = super.llvmPackages_5 // { + inherit (llvmPackages_5) llvm clang-unwrapped; }; darwin = super.darwin // { |