From 985fe03be555acc522cb060268346460655ac08c Mon Sep 17 00:00:00 2001 From: Astro Date: Sun, 24 Mar 2019 18:44:36 +0100 Subject: [PATCH] nix: move hydra-build-products to adc2tcp-dist derivation This should improve reachability of the binary file in the Hydra web interface. --- default.nix | 4 +++- nix/adc2tcp.nix | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index 4f349e3..f7622c3 100644 --- a/default.nix +++ b/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { dontBuild = true; installPhase = '' - mkdir -p $out/bin $out/lib + mkdir -p $out/bin $out/lib $out/nix-support BIN=$out/lib/adc2tcp ln -s ${adc2tcp}/lib/adc2tcp $BIN @@ -38,5 +38,7 @@ stdenv.mkDerivation { -c "shutdown" EOF chmod +x $out/bin/flash-adc2tcp + + echo file binary-dist $BIN >> $out/nix-support/hydra-build-products ''; } diff --git a/nix/adc2tcp.nix b/nix/adc2tcp.nix index cb1c038..45b3748 100644 --- a/nix/adc2tcp.nix +++ b/nix/adc2tcp.nix @@ -43,8 +43,7 @@ buildRustPackage rec { doCheck = false; installPhase = '' - mkdir -p $out/lib $out/nix-support + mkdir -p $out/lib cp target/thumbv7em-none-eabihf/release/adc2tcp $out/lib/ - echo file binary-dist $out/lib/adc2tcp >> $out/nix-support/hydra-build-products ''; }