diff options
| author | Joel Taylor <me@joelt.io> | 2014-08-21 16:15:31 -0700 |
|---|---|---|
| committer | Joel Taylor <me@joelt.io> | 2014-09-09 13:54:25 -0700 |
| commit | 2e26f7bef14678667c87dcb1f9e76dcf1e47ec3d (patch) | |
| tree | 8306ca85ac13b0acceb9dfc4494d3504dbf9bfc3 /pkgs/stdenv/darwin/default.nix | |
| parent | 7da056233f8436d361528d0eb20bec8286445a51 (diff) | |
| download | nixlib-2e26f7bef14678667c87dcb1f9e76dcf1e47ec3d.tar nixlib-2e26f7bef14678667c87dcb1f9e76dcf1e47ec3d.tar.gz nixlib-2e26f7bef14678667c87dcb1f9e76dcf1e47ec3d.tar.bz2 nixlib-2e26f7bef14678667c87dcb1f9e76dcf1e47ec3d.tar.lz nixlib-2e26f7bef14678667c87dcb1f9e76dcf1e47ec3d.tar.xz nixlib-2e26f7bef14678667c87dcb1f9e76dcf1e47ec3d.tar.zst nixlib-2e26f7bef14678667c87dcb1f9e76dcf1e47ec3d.zip | |
livcxx build
Diffstat (limited to 'pkgs/stdenv/darwin/default.nix')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index d9668d0972cf..28c863b63b0b 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgs, config }: +{ stdenv, pkgs, config, haveLibCxx }: import ../generic rec { inherit config; @@ -27,11 +27,11 @@ import ../generic rec { nativePrefix = stdenv.lib.optionalString stdenv.isSunOS "/usr"; nativeLibc = true; inherit stdenv; - libcxx = pkgs.libcxx.override { + libcxx = if haveLibCxx then pkgs.libcxx.override { libcxxabi = pkgs.libcxxabi.override { libunwind = pkgs.libunwindNative; }; - }; + } else null; binutils = import ../../build-support/native-darwin-cctools-wrapper {inherit stdenv;}; clang = pkgs.clang_34; coreutils = pkgs.coreutils; |