diff options
| author | Jude Taylor <me@jude.bio> | 2015-10-05 08:46:49 -0700 |
|---|---|---|
| committer | Jude Taylor <me@jude.bio> | 2015-10-05 08:46:56 -0700 |
| commit | 0a32eab91e7a547325958da2581933a98095d50c (patch) | |
| tree | 9ac78b2de9a984bd96b4240ddd1269a56720d6eb /pkgs/stdenv | |
| parent | 4e8da0747c88375c221bf1b0f060183a863c6851 (diff) | |
| download | nixlib-0a32eab91e7a547325958da2581933a98095d50c.tar nixlib-0a32eab91e7a547325958da2581933a98095d50c.tar.gz nixlib-0a32eab91e7a547325958da2581933a98095d50c.tar.bz2 nixlib-0a32eab91e7a547325958da2581933a98095d50c.tar.lz nixlib-0a32eab91e7a547325958da2581933a98095d50c.tar.xz nixlib-0a32eab91e7a547325958da2581933a98095d50c.tar.zst nixlib-0a32eab91e7a547325958da2581933a98095d50c.zip | |
fix LLVM packages to work in darwin stdenv
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/pure-darwin/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/stdenv/pure-darwin/default.nix b/pkgs/stdenv/pure-darwin/default.nix index 51780b6f774b..a50a63fbda66 100644 --- a/pkgs/stdenv/pure-darwin/default.nix +++ b/pkgs/stdenv/pure-darwin/default.nix @@ -220,11 +220,13 @@ in rec { persistent3 = orig: with stage3.pkgs; { inherit gnumake gzip gnused bzip2 gawk ed xz patch bash - libcxxabi libcxx ncurses libffi zlib llvm gmp pcre gnugrep + libcxxabi libcxx ncurses libffi zlib gmp pcre gnugrep coreutils findutils diffutils patchutils; - llvmPackages = orig.llvmPackages // { - inherit (llvmPackages) llvm clang-unwrapped; + llvmPackages = let llvmOverride = llvmPackages.llvm.override { inherit libcxxabi; }; + in orig.llvmPackages // { + llvm = llvmOverride; + clang-unwrapped = llvmPackages.clang-unwrapped.override { llvm = llvmOverride; }; }; darwin = orig.darwin // { |