diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-06-08 14:42:57 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-06-08 14:42:57 -0700 |
| commit | 7464908ae482dfca7251ce23241d3f0c000d92d6 (patch) | |
| tree | 7a85849c7664079a01490d5d0b4a87a3ff921ea7 /nixos | |
| parent | e35c9afcff6ca110aa42c29cee17858f774054ae (diff) | |
| parent | 16165ddc38630d7da0e0bf4a6b3b9347b923b7b4 (diff) | |
| download | nixlib-7464908ae482dfca7251ce23241d3f0c000d92d6.tar nixlib-7464908ae482dfca7251ce23241d3f0c000d92d6.tar.gz nixlib-7464908ae482dfca7251ce23241d3f0c000d92d6.tar.bz2 nixlib-7464908ae482dfca7251ce23241d3f0c000d92d6.tar.lz nixlib-7464908ae482dfca7251ce23241d3f0c000d92d6.tar.xz nixlib-7464908ae482dfca7251ce23241d3f0c000d92d6.tar.zst nixlib-7464908ae482dfca7251ce23241d3f0c000d92d6.zip | |
Merge pull request #8232 from dezgeg/pr-installer-fix
install-cd: Include nixos-artwork to fix installer tests With the move from storing grub images in the nixpkgs repo to storing them in the nix store, we broke the installer tests as the iso does not contain the artwork needed for the grub splash. This commit fixes the inclusion of the artwork in the iso.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/installation-cd-base.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index a660199cbe0c..5bd10823108c 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -30,8 +30,8 @@ with lib; # To speed up installation a little bit, include the complete stdenv # in the Nix store on the CD. Archive::Cpio is needed for the - # initrd builder. - isoImage.storeContents = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio ]; + # initrd builder. nixos-artwork is needed for the GRUB background. + isoImage.storeContents = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio pkgs.nixos-artwork ]; # EFI booting isoImage.makeEfiBootable = true; |