* Fix some Hydra dependencies that broke due to the Perl upgrade.

svn path=/nixpkgs/trunk/; revision=33020
This commit is contained in:
Eelco Dolstra
2012-03-12 15:31:14 +00:00
parent 5b6856ff52
commit 29df27f469
3 changed files with 33 additions and 27 deletions

View File

@@ -1,7 +1,7 @@
{ stdenv, fetchurl, noSysDirs, zlib, cross ? null, gold ? false, bison ? null, flex2535 ? null, bc ? null, dejagnu ? null }:
let basename = "binutils-2.21.1a"; in
stdenv.mkDerivation rec {
stdenv.mkDerivation ( rec {
name = basename + stdenv.lib.optionalString (cross != null) "-${cross.config}";
src = fetchurl {
@@ -65,4 +65,9 @@ stdenv.mkDerivation rec {
collision due to the ld/as wrappers/symlinks in the latter. */
priority = "10";
};
}
} // (stdenv.lib.optionalAttrs gold {
postInstall = ''
rm $out/bin/ld
ln -sf $out/bin/ld.gold $out/bin/ld
'';
} ) )