diff options
author | Robin Gloster <mail@glob.in> | 2019-05-18 09:36:24 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-18 09:36:24 +0000 |
commit | 6cf583cf2f8d3cb89fa8a4d6edd86f4236862ea6 (patch) | |
tree | 6590fc8630f685b81d4f1a5487a54b31785f3c8b /nixos/modules/installer | |
parent | d40443ba6de52faf08bb33198c6e501f46b85a89 (diff) | |
parent | 786f02f7a45621b9f628f63649ff92546aff83b7 (diff) | |
download | nixlib-6cf583cf2f8d3cb89fa8a4d6edd86f4236862ea6.tar nixlib-6cf583cf2f8d3cb89fa8a4d6edd86f4236862ea6.tar.gz nixlib-6cf583cf2f8d3cb89fa8a4d6edd86f4236862ea6.tar.bz2 nixlib-6cf583cf2f8d3cb89fa8a4d6edd86f4236862ea6.tar.lz nixlib-6cf583cf2f8d3cb89fa8a4d6edd86f4236862ea6.tar.xz nixlib-6cf583cf2f8d3cb89fa8a4d6edd86f4236862ea6.tar.zst nixlib-6cf583cf2f8d3cb89fa8a4d6edd86f4236862ea6.zip |
Merge pull request #60406 from JohnAZoidberg/remove-isnull
treewide: Remove usage of isNull
Diffstat (limited to 'nixos/modules/installer')
-rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index fd780be20825..d5c92cfc1d9e 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -198,7 +198,7 @@ let fi ${ # When there is a theme configured, use it, otherwise use the background image. - if (!isNull config.isoImage.grubTheme) then '' + if config.isoImage.grubTheme != null then '' # Sets theme. set theme=(hd0)/EFI/boot/grub-theme/theme.txt # Load theme fonts @@ -622,7 +622,7 @@ in { source = "${pkgs.memtest86plus}/memtest.bin"; target = "/boot/memtest.bin"; } - ] ++ optionals (!isNull config.isoImage.grubTheme) [ + ] ++ optionals (config.isoImage.grubTheme != null) [ { source = config.isoImage.grubTheme; target = "/EFI/boot/grub-theme"; } |