M-Labs
/
nix-scripts
9
0
Fork 9
Code Issues 6 Pull Requests Releases Wiki Activity

mcu: keep cargo tarball name the same for different variants 

* This partially reverts 726ee7aa82, and keeps allowing the generated binary to have a name different from the derivation.
This commit is contained in:
Harry Ho 2021-06-29 17:14:34 +08:00
parent e43223532c
commit 868216eb2d
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mcu/default.nix
View File

@ -8,17 +8,12 @@ let
rustPlatform = pkgs.recurseIntoAttrs (pkgs.callPackage ./rustPlatform.nix { rustPlatform = pkgs.recurseIntoAttrs (pkgs.callPackage ./rustPlatform.nix {
inherit rustManifest; inherit rustManifest;
}); });
buildStm32Firmware = { name, src, patchPhase ? "", extraNativeBuildInputs ? [], checkPhase ? "", doCheck ? true, ... } @ args: buildStm32Firmware = { name, src, cargoDepsName ? name, patchPhase ? "", extraNativeBuildInputs ? [], checkPhase ? "", doCheck ? true, ... } @ args:
let let
# If binaryName is specified as an arg of buildStm32Firmware,
# then the .nix containing the cargoSha256 must be named "cargosha256-${binaryName}.nix";
# otherwise, the .nix must be named "cargosha256.nix".
cargoSha256Drv = pkgs.runCommand "${name}-cargosha256" { } '' cargoSha256Drv = pkgs.runCommand "${name}-cargosha256" { } ''
cp "${src}/cargosha256${ cp "${src}/cargosha256.nix" $out
if (args ? binaryName) then "-" + args.binaryName else ""
}.nix" $out
''; '';
# If binaryName is specified as an arg of buildStm32Firmware, # If binaryName is specified,
# then pass it as an argument for `cargo build`; otherwise, do not add such argument. # then pass it as an argument for `cargo build`; otherwise, do not add such argument.
extraCargoBuildArgs = ( extraCargoBuildArgs = (
(if (args ? extraCargoBuildArgs) then (args.extraCargoBuildArgs + " ") else "") + (if (args ? extraCargoBuildArgs) then (args.extraCargoBuildArgs + " ") else "") +
@ -30,7 +25,7 @@ let
binaryName = if (args ? binaryName) then args.binaryName else name; binaryName = if (args ? binaryName) then args.binaryName else name;
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
inherit name; inherit name cargoDepsName;
version = "0.0.0"; version = "0.0.0";
inherit src; inherit src;
@ -60,6 +55,7 @@ in
stabilizer-dual-iir = buildStm32Firmware { stabilizer-dual-iir = buildStm32Firmware {
name = "stabilizer-dual-iir"; name = "stabilizer-dual-iir";
binaryName = "dual-iir"; binaryName = "dual-iir";
cargoDepsName = "stabilizer";
src = <stabilizerSrc>; src = <stabilizerSrc>;
patchPhase = '' patchPhase = ''
substituteInPlace src/hardware/configuration.rs \ substituteInPlace src/hardware/configuration.rs \