From 7a3501953c02bf41c34844fb1da4630a30b59bb0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 3 Jan 2008 16:56:03 +0000 Subject: [PATCH] * Grub: patch for splashimage support. svn path=/nixpkgs/trunk/; revision=10062 --- pkgs/tools/misc/grub/default.nix | 21 ++++++++++++++++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 0a406f72b46d..1b7f052dfdf3 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, autoconf, automake}: if stdenv.system == "x86_64-linux" then abort "Grub doesn't build on x86_64-linux. You should use the build for i686-linux instead." @@ -6,8 +6,27 @@ else stdenv.mkDerivation { name = "grub-0.97"; + src = fetchurl { url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz; md5 = "cd3f3eb54446be6003156158d51f4884"; }; + + patches = [ + # Patch to add primitive splash screen support (not the fancy SUSE gfxmenu stuff). + # With this you can set splashimage=foo.xpm.gz in menu.lst to get + # a 640x480, 14-colour background. + (fetchurl { + url = "http://cvs.archlinux.org/cgi-bin/viewcvs.cgi/*checkout*/system/grub-gfx/grub-0.97-graphics.patch?rev=HEAD&cvsroot=AUR&only_with_tag=CURRENT&content-type=text/plain"; + sha256 = "0m6min9cbj71kvp0kxkxdq8dx2dwm3dj0rd5sjz5xdl13ihaj5hy"; + }) + ]; + + # Autoconf/automake required for the splashimage patch. + buildInputs = [autoconf automake]; + + preConfigure = '' + autoreconf + ''; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca9db6687727..06cbd02097a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -532,7 +532,7 @@ rec { (import ./all-packages.nix {system = "i686-linux";}).grub else import ../tools/misc/grub { - inherit fetchurl stdenv; + inherit fetchurl stdenv autoconf automake; }; gtkgnutella = import ../tools/networking/p2p/gtk-gnutella {