Author: eelco
Date: Wed May 4 12:22:56 2011
New Revision: 27138
URL: https://svn.nixos.org/websvn/nix/?rev=27138&sc=1
Log:
* Provide "null" defaults for the optional dependencies, otherwise
binutilsCross gives an evaluation error.
Modified:
nixpkgs/trunk/pkgs/development/tools/misc/binutils/default.nix
Modified: nixpkgs/trunk/pkgs/development/tools/misc/binutils/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/tools/misc/binutils/default.nix Wed May
4 10:14:02 2011 (r27137)
+++ nixpkgs/trunk/pkgs/development/tools/misc/binutils/default.nix Wed May
4 12:22:56 2011 (r27138)
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, noSysDirs, zlib, cross ? null, gold ? false, bison,
flex2535, bc, dejagnu}:
+{ stdenv, fetchurl, noSysDirs, zlib, cross ? null, gold ? false, bison ? null,
flex2535 ? null, bc ? null, dejagnu ? null }:
let
basename = "binutils-2.21";
@@ -18,10 +18,9 @@
./new-dtags.patch
];
- buildInputs = [ zlib ] ++ stdenv.lib.optional gold [dejagnu flex2535 bison
-
- # Some Gold tests require this:
- bc] ;
+ buildInputs =
+ [ zlib ]
+ ++ stdenv.lib.optional gold [dejagnu flex2535 bison /* Some Gold tests
require this: */ bc];
inherit noSysDirs;
@@ -42,7 +41,7 @@
+ stdenv.lib.optionalString (stdenv.system == "mips64-linux")
" --enable-fix-loongson2f-nop"
+ stdenv.lib.optionalString (cross != null) " --target=${cross.config}"
- + stdenv.lib.optionalString gold " --enable-gold" ;
+ + stdenv.lib.optionalString gold " --enable-gold";
meta = {
description = "GNU Binutils, tools for manipulating binaries (linker,
assembler, etc.)";
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
