diff options
| author | Peter Simons <simons@cryp.to> | 2012-11-09 18:00:49 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-11-09 18:00:49 +0100 |
| commit | 3fafdb362bca11883e35ec82fa9fc324e41b6997 (patch) | |
| tree | 2207ec4e512d21adcb5105eb97a3cfe084701ddc /pkgs/tools/misc/grub | |
| parent | 4f5e655b36b61505fc1d1c4157e4f721a5e80a8a (diff) | |
| download | nixlib-3fafdb362bca11883e35ec82fa9fc324e41b6997.tar nixlib-3fafdb362bca11883e35ec82fa9fc324e41b6997.tar.gz nixlib-3fafdb362bca11883e35ec82fa9fc324e41b6997.tar.bz2 nixlib-3fafdb362bca11883e35ec82fa9fc324e41b6997.tar.lz nixlib-3fafdb362bca11883e35ec82fa9fc324e41b6997.tar.xz nixlib-3fafdb362bca11883e35ec82fa9fc324e41b6997.tar.zst nixlib-3fafdb362bca11883e35ec82fa9fc324e41b6997.zip | |
bison: update to version 2.6.5
This update fixes the grub-2.0 warning issue that was worked around in commit 4f5e655b36b61505fc1d1c4157e4f721a5e80a8a. Consequently, that patch is no longer needed.
Diffstat (limited to 'pkgs/tools/misc/grub')
| -rw-r--r-- | pkgs/tools/misc/grub/2.0x.nix | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index d0e7738b68e0..e85e8de3dd84 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -49,17 +49,10 @@ stdenv.mkDerivation rec { sed -i '/gets is a security hole/d' grub-core/gnulib/stdio.in.h ''; - # Source code generated by bison 2.6.4 contains pragmas that trigger - # warnings when built with -Wunknown-pragmas. Since Grub compiles with - # -Werror, this causes the build to fail. We work around this issue by - # ignoring pragma-related warnings, but clearly it would be better if - # Bison wouldn't trigger that issue in the first place. A bug report - # has been sent. prePatch = '' gunzip < "${unifont_bdf}" > "unifont.bdf" sed -i "configure" \ - -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g" \ - -e "s|-Wunknown-pragmas|-Wno-pragmas|g" + -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g" ''; configureFlags = |