From 3d98549fd1c6b539820e434bf4707317c6c37eff Mon Sep 17 00:00:00 2001 From: Florian Agbuya Date: Tue, 23 Apr 2024 14:19:19 +0800 Subject: [PATCH] rename board specific packages --- flake.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 082d9c2..3330a6b 100644 --- a/flake.nix +++ b/flake.nix @@ -257,6 +257,7 @@ }; u-boot = (pkgs-armv7l.buildUBoot { + name = "${board}-u-boot"; defconfig = "xilinx_zynq_virt_defconfig"; patches = [] ++ pkgs.lib.optional (board == "fast-servo") ./fast-servo/u-boot.patch; preConfigure = '' @@ -310,7 +311,7 @@ echo file binary-dist $out/boot.bin >> $out/nix-support/hydra-build-products ''; - dtb = pkgs.runCommand "dtb" + dtb = pkgs.runCommand "${board}-dtb" { buildInputs = [ pkgs.gcc pkgs.dtc ]; } @@ -337,7 +338,7 @@ firmwareSize = 30; firmwarePartitionOffset = 8; in pkgs.stdenv.mkDerivation { - name = "sd-image"; + name = "${board}-sd-image"; nativeBuildInputs = with pkgs; [ dosfstools mtools libfaketime util-linux parted ]; buildCommand = '' mkdir -p $out/nix-support $out/sd-image @@ -402,7 +403,7 @@ rm -rf $IMGDIR ''; - in pkgs.runCommand "not-os-qemu" { + in pkgs.runCommand "${board}-qemu" { inherit qemuScript; passAsFile = [ "qemuScript" ]; preferLocalBuild = true;