summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2015-06-08 19:11:46 +0300
committerTuomas Tynkkynen <tuomas.tynkkynen@iki.fi>2015-06-08 19:12:59 +0300
commit16165ddc38630d7da0e0bf4a6b3b9347b923b7b4 (patch)
treecb746f6630af5f61e4178c69a49f453449cb04df /nixos
parent514a9fdf878a65bca0e329cbb733070f3bd0ab0f (diff)
downloadnixlib-16165ddc38630d7da0e0bf4a6b3b9347b923b7b4.tar
nixlib-16165ddc38630d7da0e0bf4a6b3b9347b923b7b4.tar.gz
nixlib-16165ddc38630d7da0e0bf4a6b3b9347b923b7b4.tar.bz2
nixlib-16165ddc38630d7da0e0bf4a6b3b9347b923b7b4.tar.lz
nixlib-16165ddc38630d7da0e0bf4a6b3b9347b923b7b4.tar.xz
nixlib-16165ddc38630d7da0e0bf4a6b3b9347b923b7b4.tar.zst
nixlib-16165ddc38630d7da0e0bf4a6b3b9347b923b7b4.zip
install-cd: Include nixos-artwork to fix installer tests
Should fix at least nixos.tests.installer.simple.x86_64-linux
http://hydra.nixos.org/build/23001712:

machine# error: cannot download Encode-Locale-1.03.tar.gz from any mirror
machine# builder for ‘/nix/store/y8gbx2d2fdcvvjy1z53xksfgq66ydlx0-Encode-Locale-1.03.tar.gz.drv’ failed with exit code 1
machine# cannot build derivation ‘/nix/store/y1knci7rix3asnh2b4kfv8jhl2j99xih-perl-Encode-Locale-1.03.drv’: 1 dependencies couldn't be built
machine# cannot build derivation ‘/nix/store/7xspjwh48kg16drv1jjg5cffaqbxbp8p-perl-libwww-perl-6.05.drv’: 1 dependencies couldn't be built
machine# cannot build derivation ‘/nix/store/8qsmz3bbk1jwhh50c3i9700bkmn8ns5c-nss-cacert-3.19.1.drv’: 1 dependencies couldn't be built
machine# cannot build derivation ‘/nix/store/0rgf2l3mdszs4a989ympwc9gk2k8wq6z-nixos-artwork-e71b684.drv’: 1 dependencies couldn't be built
...
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/installer/cd-dvd/installation-cd-base.nix4
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;