From 84a586fa9e6b35fb3d995d6b14c26239cacb1115 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 24 Sep 2014 16:54:43 +0200 Subject: [PATCH] stdenvDarwin: Do not wrap clang twice --- pkgs/stdenv/darwin/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index f42cd7139d9..6ab83aae188 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -26,7 +26,6 @@ import ../generic rec { gcc = import ../../build-support/clang-wrapper { nativeTools = false; - nativePrefix = stdenv.lib.optionalString stdenv.isSunOS "/usr"; nativeLibc = true; inherit stdenv; libcxx = if haveLibCxx then pkgs.libcxx.override { @@ -35,7 +34,7 @@ import ../generic rec { }; } else null; binutils = import ../../build-support/native-darwin-cctools-wrapper {inherit stdenv;}; - clang = if useClang33 then pkgs.clang_33 else pkgs.clang; + clang = if useClang33 then pkgs.clang_33.clang else pkgs.clang.clang; coreutils = pkgs.coreutils; shell = pkgs.bash + "/bin/sh"; };