public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stdenv-linux: Fix binutils override

Browse Source 
This ensures that pkgs.binutils equals the binutils used in the final
stdenv, as intended.
This commit is contained in:
Eelco Dolstra 2014-01-28 15:22:51 +01:00
parent 134d52cb5f
commit a8a5a59059
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/stdenv/linux/default.nix
View File

@ -296,12 +296,13 @@ rec {
extraAttrs = { extraAttrs = {
inherit (stdenvLinuxBoot3Pkgs) glibc; inherit (stdenvLinuxBoot3Pkgs) glibc;
inherit platform bootstrapTools; inherit platform bootstrapTools;
shellPackage = stdenvLinuxBoot4Pkgs.bash; shellPackage = stdenvLinuxBoot4Pkgs.bash;
}; };
overrides = pkgs: { overrides = pkgs: {
inherit gcc; inherit gcc;
inherit (stdenvLinuxBoot3Pkgs) binutils glibc; inherit (stdenvLinuxBoot3Pkgs) glibc;
inherit (stdenvLinuxBoot4Pkgs) binutils;
inherit (stdenvLinuxBoot4Pkgs) inherit (stdenvLinuxBoot4Pkgs)
gzip bzip2 xz bash coreutils diffutils findutils gawk gzip bzip2 xz bash coreutils diffutils findutils gawk
gnumake gnused gnutar gnugrep gnupatch patchelf gnumake gnused gnutar gnugrep gnupatch patchelf