diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 94d861652722..353cd9f40bce 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -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,9 +65,4 @@ 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 - ''; -} ) ) +} diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 3dae4c7c6eee..caa277bfbf5f 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -40,19 +40,18 @@ stdenv.mkDerivation { name = "hydra-${version}"; src = fetchurl { - url = "http://hydra.nixos.org/build/1264023/download/2/hydra-${version}.tar.gz"; - sha256 = "62cecc2da9cb0353ab4eb1f66b6783c0195421c35ba6b6eace9d3b56a9275631"; + url = http://hydra.nixos.org/build/1142240/download/2/hydra-0.1pre27592.tar.gz; + sha256 = "0197bcfkabqqv7611fh9kjabfm0nfci8kanfaa59hqwf3h6fmpwz"; }; configureFlags = "--with-nix=${nix}"; buildInputs = [ perl makeWrapper libtool nix unzip nukeReferences pkgconfig boehmgc ] ++ perldeps ; - hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( - [ libxslt sqlite subversion openssh nix coreutils findutils - gzip bzip2 lzma gnutar unzip git mercurial gnused graphviz - rpm dpkg cdrkit - ])); + hydraPath = stdenv.lib.concatStringsSep ":" (map (p: "${p}/bin") ( [ + libxslt sqlite subversion openssh nix coreutils findutils + gzip bzip2 lzma gnutar unzip git mercurial gnused graphviz + rpm dpkg cdrkit])); postInstall = '' for i in "$out/bin/"*; do