diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-02-19 13:27:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-19 13:27:03 +0100 |
| commit | 4b694d5e3d45830864fd85c42a9e32075b68c82b (patch) | |
| tree | 0da11ec61b76e9db12cc10803ae8b5851a08e816 /nixos | |
| parent | 53cdc362a14607f683ba7bd60b1473d91d0c9ec8 (diff) | |
| parent | aee42549dddeb2474a2286fbcbbb2bd2239530fb (diff) | |
| download | nixpkgs-4b694d5e3d45830864fd85c42a9e32075b68c82b.tar nixpkgs-4b694d5e3d45830864fd85c42a9e32075b68c82b.tar.gz nixpkgs-4b694d5e3d45830864fd85c42a9e32075b68c82b.tar.bz2 nixpkgs-4b694d5e3d45830864fd85c42a9e32075b68c82b.tar.lz nixpkgs-4b694d5e3d45830864fd85c42a9e32075b68c82b.tar.xz nixpkgs-4b694d5e3d45830864fd85c42a9e32075b68c82b.tar.zst nixpkgs-4b694d5e3d45830864fd85c42a9e32075b68c82b.zip | |
Merge pull request #113674 from SuperSandro2000/fix-collection16
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/printing/cupsd.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/system/boot/loader/grub/install-grub.pl | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index e67badfcd29..b19cd073252 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -270,7 +270,7 @@ in drivers = mkOption { type = types.listOf types.path; default = []; - example = literalExample "with pkgs; [ gutenprint hplip splix cups-googlecloudprint ]"; + example = literalExample "with pkgs; [ gutenprint hplip splix ]"; description = '' CUPS drivers to use. Drivers provided by CUPS, cups-filters, Ghostscript and Samba are added unconditionally. If this list contains diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 59f5638044f..6e354f013fa 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -356,11 +356,11 @@ else { if ($suffix eq ".jpg") { $suffix = ".jpeg"; } - if ($backgroundColor) { - $conf .= " - background_color '$backgroundColor' - "; - } + if ($backgroundColor) { + $conf .= " + background_color '$backgroundColor' + "; + } copy $splashImage, "$bootPath/background$suffix" or die "cannot copy $splashImage to $bootPath: $!\n"; $conf .= " insmod " . substr($suffix, 1) . " |