diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix index 8cf349fbd078..c769bc80a481 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix @@ -52,9 +52,7 @@ in enable_uart=1 ''; in '' - for f in bootcode.bin fixup.dat start.elf; do - cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/$f boot/ - done + (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/) cp ${patchedUboot}/u-boot.bin boot/u-boot-rpi3.bin cp ${configTxt} boot/config.txt ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./boot diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 76f5d4bf6472..0b858746ff0a 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -44,9 +44,7 @@ in enable_uart=1 ''; in '' - for f in bootcode.bin fixup.dat start.elf; do - cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/$f boot/ - done + (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/) cp ${pkgs.ubootRaspberryPi2}/u-boot.bin boot/u-boot-rpi2.bin cp ${pkgs.ubootRaspberryPi3_32bit}/u-boot.bin boot/u-boot-rpi3.bin cp ${configTxt} boot/config.txt diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index c7915b578d8a..886ffd9a0923 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -34,9 +34,7 @@ in sdImage = { populateBootCommands = '' - for f in bootcode.bin fixup.dat start.elf; do - cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/$f boot/ - done + (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/) cp ${pkgs.ubootRaspberryPi}/u-boot.bin boot/u-boot-rpi.bin echo 'kernel u-boot-rpi.bin' > boot/config.txt ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./boot