Merge branch 'grub' of git://github.com/ts468/nixpkgs

Fix grubTarget on nodev installs
This commit is contained in:
Shea Levy 2015-02-20 07:47:06 -05:00
commit 2fe3a3c203

View File

@ -34,7 +34,7 @@ let
shell = "${pkgs.stdenv.shell}";
fullVersion = (builtins.parseDrvName realGrub.name).version;
grubEfi = f grubEfi;
grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f grubEfi.grubTarget else "";
grubTargetEfi = if cfg.efiSupport && (cfg.version == 2) then f (grubEfi.grubTarget or "") else "";
inherit (efi) efiSysMountPoint canTouchEfiVariables;
inherit (cfg)
version extraConfig extraPerEntryConfig extraEntries