diff --git a/pkgs/development/tools/misc/binutils/snapshot.nix b/pkgs/development/tools/misc/binutils/snapshot.nix index 79f01cad4ef..1a02eba7579 100644 --- a/pkgs/development/tools/misc/binutils/snapshot.nix +++ b/pkgs/development/tools/misc/binutils/snapshot.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, noSysDirs, cross ? null}: +{stdenv, fetchurl, noSysDirs, zlib, cross ? null}: let basename = "binutils-2.20.51"; @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { ./new-dtags.patch ]; + buildInputs = [ zlib ]; + inherit noSysDirs; preConfigure = '' diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index af98fd98b74..2203601f836 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -191,7 +191,7 @@ rec { # 6) Construct a third stdenv identical to the 2nd, except that # this one uses the Glibc built in step 3. It still uses # the recent binutils and rest of the bootstrap tools, including GCC. - stdenvLinuxBoot3 = removeAttrs (stdenvBootFun { + stdenvLinuxBoot3 = stdenvBootFun { gcc = wrapGCC { binutils = stdenvLinuxBoot1Pkgs.binutils; coreutils = bootstrapTools; @@ -202,7 +202,7 @@ rec { inherit (stdenvLinuxBoot1Pkgs) perl; }; inherit fetchurl; - }) ["gcc" "binutils"]; + }; # 7) The packages that can be built using the third stdenv.