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

Fix evaluation error in the ISOs

Browse Source
This commit is contained in:
Eelco Dolstra 2013-10-24 01:48:07 +02:00
parent 1d6b939676
commit c4149c7b56
1 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nixos/modules/system/boot/loader/grub/grub.nix
View File

@ -219,17 +219,20 @@ in
###### implementation ###### implementation
config = mkIf cfg.enable { config = mkMerge [
boot.loader.grub.devices = optional (cfg.device != "") cfg.device; { boot.loader.grub.splashImage = mkDefault (
boot.loader.grub.splashImage = mkDefault (
if cfg.version == 1 then pkgs.fetchurl { if cfg.version == 1 then pkgs.fetchurl {
url = http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz; url = http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz;
sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59"; sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59";
} }
# GRUB 1.97 doesn't support gzipped XPMs. # GRUB 1.97 doesn't support gzipped XPMs.
else ./winkler-gnu-blue-640x480.png); else ./winkler-gnu-blue-640x480.png);
}
(mkIf cfg.enable {
boot.loader.grub.devices = optional (cfg.device != "") cfg.device;
system.build.installBootLoader = system.build.installBootLoader =
if cfg.devices == [] then if cfg.devices == [] then
@ -251,6 +254,8 @@ in
${pkgs.coreutils}/bin/cp -pf "${v}" "/boot/${n}" ${pkgs.coreutils}/bin/cp -pf "${v}" "/boot/${n}"
'') config.boot.loader.grub.extraFiles); '') config.boot.loader.grub.extraFiles);
}; })
];
} }