From a232a2d2c5882bec7c50749a7eee8033cc2548ca Mon Sep 17 00:00:00 2001 From: Joel Taylor Date: Thu, 31 Jul 2014 16:04:29 -0700 Subject: [PATCH] prevent usage of binutils on darwin --- pkgs/development/tools/misc/binutils/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 8d8fc5d464e8..9bcf2ccc14f8 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -2,6 +2,8 @@ , cross ? null, gold ? true, bison ? null }: +assert !stdenv.isDarwin; + let basename = "binutils-2.23.1"; in with { inherit (stdenv.lib) optional optionals optionalString; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a46693b92359..714a06ea62ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3769,9 +3769,11 @@ let bam = callPackage ../development/tools/build-managers/bam {}; - binutils = callPackage ../development/tools/misc/binutils { - inherit noSysDirs; - }; + binutils = if stdenv.isDarwin + then stdenv.gcc.binutils + else callPackage ../development/tools/misc/binutils { + inherit noSysDirs; + }; binutils_nogold = lowPrio (callPackage ../development/tools/misc/binutils { inherit noSysDirs;