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

Merge branch 'staging'

Browse Source
This commit is contained in:
Eelco Dolstra 2014-08-09 23:41:58 +02:00
commit 40602a666c
3 changed files with 7 additions and 9 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 ]; buildInputs = stdenv.lib.optionals langF77 [ gmp mpfr bison flex ];
meta.broken = true; #meta.broken = true;
} }

2
pkgs/development/tools/build-managers/cmake/setup-hook.sh
View File

@ -47,7 +47,7 @@ cmakeConfigurePhase() {
eval "$postConfigure" eval "$postConfigure"
} }
if [ -z "$dontUseCmakeConfigure" -a ! -v configurePhase ]; then if [ -z "$dontUseCmakeConfigure" -a -z "$configurePhase" ]; then
configurePhase=cmakeConfigurePhase configurePhase=cmakeConfigurePhase
fi fi

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

@ -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; });
@ -2569,10 +2571,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;
@ -3086,9 +3086,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 // {