diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2011-05-04 10:03:46 +0000 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2011-05-04 10:03:46 +0000 |
| commit | 8f7cab5d5c7556cdda34a7502581ca3391b1e7c9 (patch) | |
| tree | ad937bd3e16a6f58311deafe2207ac8d74cc5b38 /pkgs/development/tools | |
| parent | 59dae8edf4f808d49054285224c41e3675f341ef (diff) | |
| download | nixlib-8f7cab5d5c7556cdda34a7502581ca3391b1e7c9.tar nixlib-8f7cab5d5c7556cdda34a7502581ca3391b1e7c9.tar.gz nixlib-8f7cab5d5c7556cdda34a7502581ca3391b1e7c9.tar.bz2 nixlib-8f7cab5d5c7556cdda34a7502581ca3391b1e7c9.tar.lz nixlib-8f7cab5d5c7556cdda34a7502581ca3391b1e7c9.tar.xz nixlib-8f7cab5d5c7556cdda34a7502581ca3391b1e7c9.tar.zst nixlib-8f7cab5d5c7556cdda34a7502581ca3391b1e7c9.zip | |
add some versions of cppunit/boost/protobuf, added binutils with gold, added nlopt
svn path=/nixpkgs/trunk/; revision=27132
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/misc/binutils/default.nix | 10 |
1 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 1928061c81dc..f31de55b8135 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, noSysDirs, zlib, cross ? null}: +{stdenv, fetchurl, noSysDirs, zlib, cross ? null, gold ? false, bison, flex2535, bc, dejagnu}: let basename = "binutils-2.21"; @@ -18,7 +18,10 @@ stdenv.mkDerivation rec { ./new-dtags.patch ]; - buildInputs = [ zlib ]; + buildInputs = [ zlib ] ++ stdenv.lib.optional gold [dejagnu flex2535 bison + + # Some Gold tests require this: + bc] ; inherit noSysDirs; @@ -38,7 +41,8 @@ stdenv.mkDerivation rec { configureFlags = "--disable-werror" # needed for dietlibc build + stdenv.lib.optionalString (stdenv.system == "mips64-linux") " --enable-fix-loongson2f-nop" - + stdenv.lib.optionalString (cross != null) " --target=${cross.config}"; + + stdenv.lib.optionalString (cross != null) " --target=${cross.config}" + + stdenv.lib.optionalString gold " --enable-gold" ; meta = { description = "GNU Binutils, tools for manipulating binaries (linker, assembler, etc.)"; |