mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-26 23:27:29 +03:00
Hack to fix llvm/clang build on Darwin
(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:
parent
0acc4e6b26
commit
be399bf245
@ -45,5 +45,5 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
buildInputs = stdenv.lib.optionals langF77 [ gmp mpfr bison flex ];
|
buildInputs = stdenv.lib.optionals langF77 [ gmp mpfr bison flex ];
|
||||||
|
|
||||||
meta.broken = true;
|
#meta.broken = true;
|
||||||
}
|
}
|
||||||
|
@ -231,6 +231,8 @@ let
|
|||||||
else
|
else
|
||||||
defaultStdenv;
|
defaultStdenv;
|
||||||
|
|
||||||
|
stdenvApple = stdenvAdapters.overrideGCC allStdenvs.stdenvNative gccApple;
|
||||||
|
|
||||||
forceNativeDrv = drv : if crossSystem == null then drv else
|
forceNativeDrv = drv : if crossSystem == null then drv else
|
||||||
(drv // { crossDrv = drv.nativeDrv; });
|
(drv // { crossDrv = drv.nativeDrv; });
|
||||||
|
|
||||||
@ -2578,10 +2580,8 @@ let
|
|||||||
};
|
};
|
||||||
|
|
||||||
clangUnwrapped = llvm: pkg: callPackage pkg {
|
clangUnwrapped = llvm: pkg: callPackage pkg {
|
||||||
stdenv = if stdenv.isDarwin
|
stdenv = if stdenv.isDarwin then stdenvApple else stdenv;
|
||||||
then stdenvAdapters.overrideGCC stdenv gccApple
|
inherit llvm;
|
||||||
else stdenv;
|
|
||||||
llvm = llvm;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
clangSelf = clangWrapSelf llvmPackagesSelf.clang;
|
clangSelf = clangWrapSelf llvmPackagesSelf.clang;
|
||||||
@ -3095,9 +3095,7 @@ let
|
|||||||
llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix;
|
llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix;
|
||||||
|
|
||||||
llvm_v = path: callPackage path {
|
llvm_v = path: callPackage path {
|
||||||
stdenv = if stdenv.isDarwin
|
stdenv = if stdenv.isDarwin then stdenvApple else stdenv;
|
||||||
then stdenvAdapters.overrideGCC stdenv gccApple
|
|
||||||
else stdenv;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
llvmPackages = if !stdenv.isDarwin then llvmPackages_34 else llvmPackages_34 // {
|
llvmPackages = if !stdenv.isDarwin then llvmPackages_34 else llvmPackages_34 // {
|
||||||
|
Loading…
Reference in New Issue
Block a user