diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-15 22:30:56 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-03-15 22:30:56 +0200 |
| commit | ef64208eba1a2b9052ce6d96b4539163d1aeda9f (patch) | |
| tree | c4fc3d5a6b5512b0e11021e18237977440207ae1 /nixos/modules/system/boot/loader/grub/grub.nix | |
| parent | 208abe9ae3f4a3ced8942ebd3419496089e06453 (diff) | |
| parent | 3ab2949e1fdfb6ef18c2935ab3e72ea1f9348ef5 (diff) | |
| download | nixlib-ef64208eba1a2b9052ce6d96b4539163d1aeda9f.tar nixlib-ef64208eba1a2b9052ce6d96b4539163d1aeda9f.tar.gz nixlib-ef64208eba1a2b9052ce6d96b4539163d1aeda9f.tar.bz2 nixlib-ef64208eba1a2b9052ce6d96b4539163d1aeda9f.tar.lz nixlib-ef64208eba1a2b9052ce6d96b4539163d1aeda9f.tar.xz nixlib-ef64208eba1a2b9052ce6d96b4539163d1aeda9f.tar.zst nixlib-ef64208eba1a2b9052ce6d96b4539163d1aeda9f.zip | |
Merge commit '3ab2949' from staging into master
Conflicts: pkgs/development/compilers/llvm/6/llvm.nix pkgs/servers/home-assistant/component-packages.nix
Diffstat (limited to 'nixos/modules/system/boot/loader/grub/grub.nix')
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/grub.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 1590708dab18..e2cff1c1bd94 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -40,7 +40,7 @@ let { splashImage = f cfg.splashImage; grub = f grub; grubTarget = f (grub.grubTarget or ""); - shell = "${pkgs.stdenv.shell}"; + shell = "${pkgs.runtimeShell}"; fullName = (builtins.parseDrvName realGrub.name).name; fullVersion = (builtins.parseDrvName realGrub.name).version; grubEfi = f grubEfi; @@ -536,7 +536,7 @@ in btrfsprogs = pkgs.btrfs-progs; }; in pkgs.writeScript "install-grub.sh" ('' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} set -e export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX XMLSAXBase ListCompare ])} ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"} |