alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #3465 from joelteon/picky-binutils

Browse source 
Stop binutils from trying to build on Darwin
This commit is contained in:
Michael Raskin 2014-09-03 19:57:09 +04:00
parent 3e841ef642 a232a2d2c5
commit d81303813a
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/tools/misc/binutils/default.nix
View file

@ -2,6 +2,8 @@
, cross ? null, gold ? true, bison ? null , cross ? null, gold ? true, bison ? null
}: }:
assert !stdenv.isDarwin;
let basename = "binutils-2.23.1"; in let basename = "binutils-2.23.1"; in
with { inherit (stdenv.lib) optional optionals optionalString; }; with { inherit (stdenv.lib) optional optionals optionalString; };

8
pkgs/top-level/all-packages.nix
View file

@ -3917,9 +3917,11 @@ let
bam = callPackage ../development/tools/build-managers/bam {}; bam = callPackage ../development/tools/build-managers/bam {};
binutils = callPackage ../development/tools/misc/binutils { binutils = if stdenv.isDarwin
inherit noSysDirs; then stdenv.gcc.binutils
}; else callPackage ../development/tools/misc/binutils {
inherit noSysDirs;
};
binutils_nogold = lowPrio (callPackage ../development/tools/misc/binutils { binutils_nogold = lowPrio (callPackage ../development/tools/misc/binutils {
inherit noSysDirs; inherit noSysDirs;