diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-08 12:06:12 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-08 12:06:12 +0200 |
| commit | dc33419285c09720de70fe8edf5434736a2462b9 (patch) | |
| tree | 58b20bca2075a06ad5b720c6ebf0dc55635e6b10 /nixos/modules/system | |
| parent | b59847b848079ba872e18b5f0683c1bff7e924ba (diff) | |
| parent | b56c66e7e8565b16a4964840ef40243e07f78e84 (diff) | |
| download | nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar.gz nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar.bz2 nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar.lz nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar.xz nixlib-dc33419285c09720de70fe8edf5434736a2462b9.tar.zst nixlib-dc33419285c09720de70fe8edf5434736a2462b9.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/system')
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/grub.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 2 |
2 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 67e8bf6fd654..3975372e15ec 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -83,7 +83,7 @@ let ] ++ (optional (cfg.fontSize!=null) "--size ${toString cfg.fontSize}"))) ); - defaultSplash = "${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bootloader}/share/artwork/gnome/nix-wallpaper-simple-dark-gray_bootloader.png"; + defaultSplash = pkgs.nixos-artwork.wallpapers.simple-dark-gray-bootloader.gnomeFilePath; in { diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 9bf3228d1ad6..d551466f52eb 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -584,7 +584,7 @@ in { assertion = !config.boot.loader.supportsInitrdSecrets -> all (source: builtins.isPath source || - (builtins.isString source && hasPrefix source builtins.storeDir)) + (builtins.isString source && hasPrefix builtins.storeDir source)) (attrValues config.boot.initrd.secrets); message = '' boot.loader.initrd.secrets values must be unquoted paths when |