From a8a5a5905904b1319af5a0e1cfe03e577333013e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Tue, 28 Jan 2014 15:22:51 +0100 Subject: [PATCH] stdenv-linux: Fix binutils override This ensures that pkgs.binutils equals the binutils used in the final stdenv, as intended. --- pkgs/stdenv/linux/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index bedeea0915d3..408c362bedbc 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -296,12 +296,13 @@ rec { extraAttrs = { inherit (stdenvLinuxBoot3Pkgs) glibc; inherit platform bootstrapTools; - shellPackage = stdenvLinuxBoot4Pkgs.bash; + shellPackage = stdenvLinuxBoot4Pkgs.bash; }; overrides = pkgs: { inherit gcc; - inherit (stdenvLinuxBoot3Pkgs) binutils glibc; + inherit (stdenvLinuxBoot3Pkgs) glibc; + inherit (stdenvLinuxBoot4Pkgs) binutils; inherit (stdenvLinuxBoot4Pkgs) gzip bzip2 xz bash coreutils diffutils findutils gawk gnumake gnused gnutar gnugrep gnupatch patchelf