summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-01-28 15:22:51 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-01-28 15:23:57 +0100
commita8a5a5905904b1319af5a0e1cfe03e577333013e (patch)
treec90a4f31dd77433095b4b9a47c51529ac32a4371
parent134d52cb5fb2328add74107acf93d2c616abdbcd (diff)
downloadnixlib-a8a5a5905904b1319af5a0e1cfe03e577333013e.tar
nixlib-a8a5a5905904b1319af5a0e1cfe03e577333013e.tar.gz
nixlib-a8a5a5905904b1319af5a0e1cfe03e577333013e.tar.bz2
nixlib-a8a5a5905904b1319af5a0e1cfe03e577333013e.tar.lz
nixlib-a8a5a5905904b1319af5a0e1cfe03e577333013e.tar.xz
nixlib-a8a5a5905904b1319af5a0e1cfe03e577333013e.tar.zst
nixlib-a8a5a5905904b1319af5a0e1cfe03e577333013e.zip
stdenv-linux: Fix binutils override
This ensures that pkgs.binutils equals the binutils used in the final
stdenv, as intended.
-rw-r--r--pkgs/stdenv/linux/default.nix5
1 files 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