Author: ludo Date: 2010-07-04 21:11:13 +0000 (Sun, 04 Jul 2010) New Revision: 22465
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22465&view=rev Modified: nixpkgs/trunk/pkgs/tools/misc/grub/1.9x.nix nixpkgs/trunk/pkgs/top-level/all-packages.nix Log: GNU GRUB 1.98. Changes: Modified: nixpkgs/trunk/pkgs/tools/misc/grub/1.9x.nix =================================================================== --- nixpkgs/trunk/pkgs/tools/misc/grub/1.9x.nix 2010-07-04 21:11:08 UTC (rev 22464) +++ nixpkgs/trunk/pkgs/tools/misc/grub/1.9x.nix 2010-07-04 21:11:13 UTC (rev 22465) @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, bison, ncurses, libusb, freetype }: +{ fetchurl, stdenv, bison, gettext, ncurses, libusb, freetype, qemu }: let unifont_bdf = fetchurl { url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";; @@ -7,15 +7,35 @@ in stdenv.mkDerivation rec { - name = "grub-1.97.2"; + name = "grub-1.98"; src = fetchurl { url = "ftp://alpha.gnu.org/gnu/grub/${name}.tar.gz";; - sha256 = "0j8wdaq9r0ayfsz25lbq2k3q0iasq5cyldlip8jyq2g87iid5hcq"; + sha256 = "05660x82y2rwrzm0d1c4z07fbh02qwmacsmbbav6fa855s4w3wmy"; }; - buildInputs = [ bison ncurses libusb freetype ]; + buildInputs = [ bison ncurses libusb freetype gettext ] + ++ stdenv.lib.optional doCheck qemu; + preConfigure = + '' for i in "tests/util/"*.in + do + sed -i "$i" -e's|/bin/bash|/bin/sh|g' + done + + # Apparently, the QEMU executable is no longer called + # `qemu-system-i386', even on i386. + # + # In addition, use `-nodefaults' to avoid errors like: + # + # chardev: opening backend "stdio" failed + # qemu: could not open serial device 'stdio': Invalid argument + # + # See <http://www.mail-archive.com/[email protected]/msg22775.html>. + sed -i "tests/util/grub-shell.in" \ + -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g' + ''; + patches = [ # The udev rules for LVM create symlinks in /dev/mapper rathe # than device nodes, causing GRUB to fail to recognize LVM Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix =================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-07-04 21:11:08 UTC (rev 22464) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix 2010-07-04 21:11:13 UTC (rev 22465) @@ -902,7 +902,7 @@ }; grub2 = import ../tools/misc/grub/1.9x.nix { - inherit stdenv fetchurl bison ncurses libusb freetype; + inherit stdenv fetchurl bison gettext ncurses libusb freetype qemu; }; gssdp = import ../development/libraries/gssdp { _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
