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

Merge pull request #3903 from wkennington/master.grub

Browse Source 
Bring back grub update with fixes
This commit is contained in:
Aristid Breitkreuz
2014-09-02 20:59:27 +02:00
parent 7b7fd5044f 961e9867b3
commit 3a33731e54
11 changed files with 281 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
pkgs/tools/misc/grub/2.0x.nix
View File

@@ -1,30 +1,45 @@
{ fetchurl, stdenv, flex, bison, gettext, ncurses, libusb, freetype, qemu
, devicemapper, EFIsupport ? false }:
{ stdenv, fetchurl, autogen, flex, bison, python, autoconf, automake
, gettext, ncurses, libusb, freetype, qemu, devicemapper
, linuxPackages ? null
, efiSupport ? false
, zfsSupport ? false
}:
with stdenv.lib;
let
efiSystems = {
"i686-linux".target = "i386";
"x86_64-linux".target = "x86_64";
};
prefix = "grub${if EFIsupport then "-efi" else ""}";
canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems);
version = "2.00";
prefix = "grub${if efiSupport then "-efi" else ""}";
version = "2.02-beta2";
unifont_bdf = fetchurl {
url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
};
in (
in
assert efiSupport -> canEfi;
assert zfsSupport -> linuxPackages != null && linuxPackages.zfs != null;
stdenv.mkDerivation rec {
name = "${prefix}-${version}";
src = fetchurl {
url = "mirror://gnu/grub/grub-${version}.tar.xz";
sha256 = "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq";
name = "grub-2.02-beta2.tar.xz";
url = "http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.xz";
sha256 = "13a13fhc0wf473dn73zhga15mjvkg6vqp4h25dxg4n7am2r05izn";
};
nativeBuildInputs = [ flex bison ];
nativeBuildInputs = [ autogen flex bison python autoconf automake ];
buildInputs = [ ncurses libusb freetype gettext devicemapper ]
++ stdenv.lib.optional doCheck qemu;
++ optional doCheck qemu
++ optional zfsSupport linuxPackages.zfs;
preConfigure =
'' for i in "tests/util/"*.in
@@ -43,27 +58,19 @@ stdenv.mkDerivation rec {
# See <http://www.mail-archive.com/qemu-devel@nongnu.org/msg22775.html>.
sed -i "tests/util/grub-shell.in" \
-e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g'
# Fix for building on Glibc 2.16. Won't be needed once the
# gnulib in grub is updated.
sed -i '/gets is a security hole/d' grub-core/gnulib/stdio.in.h
'';
prePatch =
'' gunzip < "${unifont_bdf}" > "unifont.bdf"
'' sh autogen.sh
gunzip < "${unifont_bdf}" > "unifont.bdf"
sed -i "configure" \
-e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"
'';
patches = [ ./fix-bash-completion.patch ];
configureFlags =
let arch = if stdenv.system == "i686-linux" then "i386"
else if stdenv.system == "x86_64-linux" then "x86_64"
else throw "unsupported EFI firmware architecture";
in
stdenv.lib.optionals EFIsupport
[ "--with-platform=efi" "--target=${arch}" "--program-prefix=" ];
configureFlags = optional zfsSupport "--enable-libzfs"
++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystems.${stdenv.system}.target}" "--program-prefix=" ];
doCheck = false;
enableParallelBuilding = true;
@@ -72,7 +79,7 @@ stdenv.mkDerivation rec {
paxmark pms $out/sbin/grub-{probe,bios-setup}
'';
meta = {
meta = with stdenv.lib; {
description = "GNU GRUB, the Grand Unified Boot Loader (2.x beta)";
longDescription =
@@ -89,11 +96,8 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/grub/;
license = stdenv.lib.licenses.gpl3Plus;
license = licenses.gpl3Plus;
platforms = if EFIsupport then
[ "i686-linux" "x86_64-linux" ]
else
stdenv.lib.platforms.gnu;
platforms = platforms.gnu;
};
}
})