nix: move hydra-build-products to adc2tcp-dist derivation

This should improve reachability of the binary file in the Hydra web
interface.
This commit is contained in:
Astro 2019-03-24 18:44:36 +01:00
parent 6ae87db7e1
commit 985fe03be5
2 changed files with 4 additions and 3 deletions

View File

@ -24,7 +24,7 @@ stdenv.mkDerivation {
dontBuild = true; dontBuild = true;
installPhase = '' installPhase = ''
mkdir -p $out/bin $out/lib mkdir -p $out/bin $out/lib $out/nix-support
BIN=$out/lib/adc2tcp BIN=$out/lib/adc2tcp
ln -s ${adc2tcp}/lib/adc2tcp $BIN ln -s ${adc2tcp}/lib/adc2tcp $BIN
@ -38,5 +38,7 @@ stdenv.mkDerivation {
-c "shutdown" -c "shutdown"
EOF EOF
chmod +x $out/bin/flash-adc2tcp chmod +x $out/bin/flash-adc2tcp
echo file binary-dist $BIN >> $out/nix-support/hydra-build-products
''; '';
} }

View File

@ -43,8 +43,7 @@ buildRustPackage rec {
doCheck = false; doCheck = false;
installPhase = '' installPhase = ''
mkdir -p $out/lib $out/nix-support mkdir -p $out/lib
cp target/thumbv7em-none-eabihf/release/adc2tcp $out/lib/ cp target/thumbv7em-none-eabihf/release/adc2tcp $out/lib/
echo file binary-dist $out/lib/adc2tcp >> $out/nix-support/hydra-build-products
''; '';
} }