diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-11 11:58:49 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-11 11:58:49 +0100 |
commit | 2af1cb3aa673102491ffd8cfdeca8ae2dec154b5 (patch) | |
tree | 4906c8441c7715a69f3ea17b883d5d19b8111021 /pkgs/stdenv/linux/default.nix | |
parent | fabbd0f0f7fdb536f56d73487aec198c24163fd0 (diff) | |
parent | a11a28107120612c0284a19d41b6ffb5750a65ac (diff) | |
download | nixlib-2af1cb3aa673102491ffd8cfdeca8ae2dec154b5.tar nixlib-2af1cb3aa673102491ffd8cfdeca8ae2dec154b5.tar.gz nixlib-2af1cb3aa673102491ffd8cfdeca8ae2dec154b5.tar.bz2 nixlib-2af1cb3aa673102491ffd8cfdeca8ae2dec154b5.tar.lz nixlib-2af1cb3aa673102491ffd8cfdeca8ae2dec154b5.tar.xz nixlib-2af1cb3aa673102491ffd8cfdeca8ae2dec154b5.tar.zst nixlib-2af1cb3aa673102491ffd8cfdeca8ae2dec154b5.zip |
Merge remote-tracking branch 'origin/binutils-2.26' into staging
This still breaks a few packages, but nothing really major: http://hydra.nixos.org/eval/1241850?filter=x86_64-linux&compare=1237919&full=#tabs-now-fail
Diffstat (limited to 'pkgs/stdenv/linux/default.nix')
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 59a8636ceace..e4abe724210c 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -187,7 +187,7 @@ rec { name = "bootstrap-gcc-wrapper"; overrides = pkgs: { - inherit (stage1.pkgs) perl binutils paxctl; + inherit (stage1.pkgs) perl binutils paxctl gnum4 bison; # This also contains the full, dynamically linked, final Glibc. }; }; @@ -204,7 +204,7 @@ rec { name = "bootstrap-gcc-wrapper"; overrides = pkgs: rec { - inherit (stage2.pkgs) binutils glibc perl patchelf linuxHeaders; + inherit (stage2.pkgs) binutils glibc perl patchelf linuxHeaders gnum4 bison; # Link GCC statically against GMP etc. This makes sense because # these builds of the libraries are only used by GCC, so it # reduces the size of the stdenv closure. @@ -238,7 +238,7 @@ rec { # because gcc (since JAR support) already depends on zlib, and # then if we already have a zlib we want to use that for the # other purposes (binutils and top-level pkgs) too. - inherit (stage3.pkgs) gettext gnum4 gmp perl glibc zlib linuxHeaders; + inherit (stage3.pkgs) gettext gnum4 bison gmp perl glibc zlib linuxHeaders; gcc = lib.makeOverridable (import ../../build-support/cc-wrapper) { nativeTools = false; |