JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stdenvDarwin: Do not wrap clang twice

Browse Source
This commit is contained in:
Eelco Dolstra 2014-09-24 16:54:43 +02:00
parent 07f603f89e
commit 84a586fa9e
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/stdenv/darwin/default.nix
View File

@ -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";
};