newell
/
nix-scripts
forked from M-Labs/nix-scripts
1
0
Fork 0
Code Pull Requests Activity

stm32: use nativeBuildInputs correctly

This commit is contained in:
Sebastien Bourdeauducq 2020-10-08 14:32:36 +08:00
parent 9754f45904
commit 0064906c6f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stm32/default.nix
View File

@ -8,7 +8,7 @@ let
rustPlatform = pkgs.recurseIntoAttrs (pkgs.callPackage ./rustPlatform.nix { rustPlatform = pkgs.recurseIntoAttrs (pkgs.callPackage ./rustPlatform.nix {
inherit rustManifest; inherit rustManifest;
}); });
buildStm32Firmware = { name, src, patchPhase ? "", extraBuildInputs ? [], checkPhase ? "" }: buildStm32Firmware = { name, src, patchPhase ? "", extraNativeBuildInputs ? [], checkPhase ? "" }:
let let
cargoSha256Drv = pkgs.runCommand "${name}-cargosha256" { } ''cp "${src}/cargosha256.nix" $out''; cargoSha256Drv = pkgs.runCommand "${name}-cargosha256" { } ''cp "${src}/cargosha256.nix" $out'';
in in
@ -20,7 +20,7 @@ let
cargoSha256 = (import cargoSha256Drv); cargoSha256 = (import cargoSha256Drv);
inherit patchPhase; inherit patchPhase;
buildInputs = [ pkgs.llvm ] ++ extraBuildInputs; nativeBuildInputs = [ pkgs.llvm ] ++ extraNativeBuildInputs;
buildPhase = '' buildPhase = ''
export CARGO_HOME=$(mktemp -d cargo-home.XXX) export CARGO_HOME=$(mktemp -d cargo-home.XXX)
cargo build --release cargo build --release
@ -59,7 +59,7 @@ in
humpback-dds = buildStm32Firmware { humpback-dds = buildStm32Firmware {
name = "humpback-dds"; name = "humpback-dds";
src = <humpbackDdsSrc>; src = <humpbackDdsSrc>;
extraBuildInputs = [ extraNativeBuildInputs = [
(pkgs.python3.withPackages(ps: [ migen ])) (pkgs.python3.withPackages(ps: [ migen ]))
pkgs.yosys pkgs.yosys
pkgs.nextpnr pkgs.nextpnr