From 2e26f7bef14678667c87dcb1f9e76dcf1e47ec3d Mon Sep 17 00:00:00 2001
From: Joel Taylor <me@joelt.io>
Date: Thu, 21 Aug 2014 16:15:31 -0700
Subject: livcxx build

---
 pkgs/stdenv/darwin/default.nix | 6 +++---
 pkgs/stdenv/default.nix        | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'pkgs/stdenv')

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index d9668d0972c..28c863b63b0 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;
diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix
index 8e8be748795..665cefbfc43 100644
--- a/pkgs/stdenv/default.nix
+++ b/pkgs/stdenv/default.nix
@@ -37,6 +37,14 @@ rec {
     inherit config;
     stdenv = stdenvNative;
     pkgs = stdenvNativePkgs;
+    haveLibCxx = true;
+  };
+
+  stdenvDarwinNaked = import ./darwin {
+    inherit config;
+    stdenv = stdenvNative;
+    pkgs = stdenvNativePkgs;
+    haveLibCxx = false;
   };
 
 
-- 
cgit 1.4.1