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

prevent usage of binutils on darwin

This commit is contained in:
Joel Taylor 2014-07-31 16:04:29 -07:00
parent 2857418659
commit a232a2d2c5
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; };

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

@ -3769,7 +3769,9 @@ 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
then stdenv.gcc.binutils
else callPackage ../development/tools/misc/binutils {
inherit noSysDirs; inherit noSysDirs;
}; };