From d3142ab6fa5124cab4e61ef58384178e1bd15a17 Mon Sep 17 00:00:00 2001 From: Astro Date: Sun, 26 Jan 2020 01:50:14 +0100 Subject: [PATCH] default.nix: fix name, rm debug --- default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/default.nix b/default.nix index 50910f3..0b81cdf 100644 --- a/default.nix +++ b/default.nix @@ -32,7 +32,6 @@ let nativeBuildInputs = nativeBuildInputs ++ [ pkgs.cargo-xbuild ]; buildPhase = '' - set -x pushd ${crateSubdir} cargo xbuild --release --frozen \ --no-default-features \ @@ -46,7 +45,7 @@ let cp target/armv7-none-eabihf/release/${name} $out/${name}.elf ''; }); - xbuildCrate = crate: features: xbuildRustPackage rec { + xbuildCrate = name: crate: features: xbuildRustPackage rec { name = "${crate}"; src = ./.; crateSubdir = crate; @@ -57,7 +56,7 @@ let in { inherit pkgs rustPlatform rustcSrc gcc; zc706 = { - zc706-experiments = xbuildCrate "experiments" "target_zc706"; - cora-experiments = xbuildCrate "experiments" "target_cora_z7_10"; + experiments-zc706 = xbuildCrate "experiments-zc706" "experiments" "target_zc706"; + experiments-cora = xbuildCrate "experiments-cora" "experiments" "target_cora_z7_10"; }; }