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

Fix indentation

Browse Source
This commit is contained in:
Eelco Dolstra 2014-01-07 10:48:14 +01:00
parent 4b1d2a50b8
commit fa15851318
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/top-level/all-packages.nix
View File

@ -2278,24 +2278,26 @@ let
clang = wrapClang clangUnwrapped; clang = wrapClang clangUnwrapped;
libcxxLLVM = callPackage ../development/compilers/llvm { stdenv = libcxxStdenv; }; libcxxLLVM = callPackage ../development/compilers/llvm { stdenv = libcxxStdenv; };
clangSelf = clangWrapSelf (callPackage ../development/compilers/llvm/clang.nix { clangSelf = clangWrapSelf (callPackage ../development/compilers/llvm/clang.nix {
stdenv = libcxxStdenv; stdenv = libcxxStdenv;
llvm = libcxxLLVM; llvm = libcxxLLVM;
}); });
clangWrapSelf = build: (import ../build-support/clang-wrapper) { clangWrapSelf = build: (import ../build-support/clang-wrapper) {
clang = build; clang = build;
stdenv = clangStdenv; stdenv = clangStdenv;
libc = glibc; libc = glibc;
binutils = binutils; binutils = binutils;
shell = bash; shell = bash;
inherit libcxx coreutils zlib; inherit libcxx coreutils zlib;
nativeTools = false; nativeTools = false;
nativeLibc = false; nativeLibc = false;
}; };
#Use this instead of stdenv to build with clang #Use this instead of stdenv to build with clang
clangStdenv = lowPrio (stdenvAdapters.overrideGCC stdenv clang); clangStdenv = lowPrio (stdenvAdapters.overrideGCC stdenv clang);
libcxxStdenv = stdenvAdapters.overrideGCC stdenv (clangWrapSelf clangUnwrapped); libcxxStdenv = stdenvAdapters.overrideGCC stdenv (clangWrapSelf clangUnwrapped);
clean = callPackage ../development/compilers/clean { }; clean = callPackage ../development/compilers/clean { };