alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #3943 from wkennington/master.grub

Browse source 
Fix grub zfs build and typo
This commit is contained in:
Michael Raskin 2014-09-03 11:39:35 +04:00
parent 18c5119f18 c369c4afbd
commit 7a47d21aec
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/system/boot/loader/grub/install-grub.pl
View file

@ -135,7 +135,7 @@ sub GrubFs {
if ($fs->type eq 'btrfs') {
my ($status, @id_info) = runCommand("btrfs subvol show @{[$fs->mount]}");
if ($status != 0) {
die "Failed to retreive subvolume info for @{[$fs->mount]}\n";
die "Failed to retrieve subvolume info for @{[$fs->mount]}\n";
}
my @ids = join("", @id_info) =~ m/Object ID:[ \t\n]*([^ \t\n]*)/;
if ($#ids > 0) {

14
pkgs/tools/misc/grub/2.0x.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, autogen, flex, bison, python, autoconf, automake
{ stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake
, gettext, ncurses, libusb, freetype, qemu, devicemapper
, linuxPackages ? null
, efiSupport ? false
@ -14,9 +14,9 @@ let
canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems);
prefix = "grub${if efiSupport then "-efi" else ""}";
prefix = "grub${if efiSupport then "-efi" else ""}${optionalString zfsSupport "-zfs"}";
version = "2.02-beta2";
version = "2.02-git-1de3a4";
unifont_bdf = fetchurl {
url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
@ -30,10 +30,10 @@ assert zfsSupport -> linuxPackages != null && linuxPackages.zfs != null;
stdenv.mkDerivation rec {
name = "${prefix}-${version}";
src = fetchurl {
name = "grub-2.02-beta2.tar.xz";
url = "http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.xz";
sha256 = "13a13fhc0wf473dn73zhga15mjvkg6vqp4h25dxg4n7am2r05izn";
src = fetchgit {
url = "git://git.savannah.gnu.org/grub.git";
rev = "1de3a48098053aaebd35232bd73e3ce3f3fdf51c";
sha256 = "0d1953nmi251czkm1dmd7vnm3iz2rkqbznlp6ph33va0d7kw1kfc";
};
nativeBuildInputs = [ autogen flex bison python autoconf automake ];