From c70d556f44a095dc4f3849610129e680c0c49207 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Tue, 4 Oct 2022 23:09:20 +0100 Subject: [PATCH] write combined-image into a directory not $out directly this makes the tftp workflow a bit easier --- default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index 0c852e4..e159298 100644 --- a/default.nix +++ b/default.nix @@ -26,10 +26,10 @@ let combined-image = nixpkgs.pkgs.runCommand "firmware.bin" { nativeBuildInputs = [ nixpkgs.buildPackages.ubootTools ]; } '' - dd if=${uimage} of=$out bs=128k conv=sync - dd if=${squashfs} of=$out bs=128k conv=sync,nocreat,notrunc oflag=append + mkdir $out + dd if=${uimage} of=$out/firmware.bin bs=128k conv=sync + dd if=${squashfs} of=$out/firmware.bin bs=128k conv=sync,nocreat,notrunc oflag=append ''; - directory = nixpkgs.pkgs.runCommand "both-kinds" {} '' mkdir $out cd $out