ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-26 23:27:29 +03:00
Code Issues Projects Releases Wiki Activity

Hack to fix llvm/clang build on Darwin

Browse Source 
(Or at least restore it to the same level as brokenness as before the
staging merge. I.e. it depends on gcc-apple, which doesn't build on
standard 10.9 systems.)
This commit is contained in:
Eelco Dolstra 2014-08-09 23:31:00 +02:00
parent 0acc4e6b26
commit be399bf245
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcc/4.2-apple64/default.nix
View File

@ -45,5 +45,5 @@ stdenv.mkDerivation rec {
buildInputs = stdenv.lib.optionals langF77 [ gmp mpfr bison flex ];
meta.broken = true;
#meta.broken = true;
}

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

@ -231,6 +231,8 @@ let
else
defaultStdenv;
stdenvApple = stdenvAdapters.overrideGCC allStdenvs.stdenvNative gccApple;
forceNativeDrv = drv : if crossSystem == null then drv else
(drv // { crossDrv = drv.nativeDrv; });
@ -2578,10 +2580,8 @@ let
};
clangUnwrapped = llvm: pkg: callPackage pkg {
stdenv = if stdenv.isDarwin
then stdenvAdapters.overrideGCC stdenv gccApple
else stdenv;
llvm = llvm;
stdenv = if stdenv.isDarwin then stdenvApple else stdenv;
inherit llvm;
};
clangSelf = clangWrapSelf llvmPackagesSelf.clang;
@ -3095,9 +3095,7 @@ let
llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix;
llvm_v = path: callPackage path {
stdenv = if stdenv.isDarwin
then stdenvAdapters.overrideGCC stdenv gccApple
else stdenv;
stdenv = if stdenv.isDarwin then stdenvApple else stdenv;
};
llvmPackages = if !stdenv.isDarwin then llvmPackages_34 else llvmPackages_34 // {