From 2ce608e479d24d2cf866e8d0e49b1692f4a978d5 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Fri, 23 Aug 2019 17:40:30 +0200
Subject: [PATCH] default.nix: fix
thx to mic92
---
default.nix | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/default.nix b/default.nix
index ba078e7..f133145 100644
--- a/default.nix
+++ b/default.nix
@@ -26,21 +26,22 @@ let
name = "rust-card10";
version = "0.0.0";
src = ./.;
- cargoSha256 = "10qv30p3kr570glnyn37b6r8pgx48zj0mr9qf84m4wk4sjp3wxsd";
- buildInputs = [ pkgsCross.arm-embedded.stdenv.cc glibc_multi ];
+ cargoSha256 = "10nims5j9r0d7pcfbbj8ycqxhcx7n07958jvkib29b0sf9c6qh3z";
+ buildInputs = [ pkgsCross.arm-embedded.stdenv.cc ];
prePatch = ''
cp ${epic-stubs}/client.c l0dable/src/
'';
+ NIX_DEBUG=1;
+ LIBCLANG_PATH="${llvmPackages.libclang}/lib";
+ CARGO_HOME="$(mktemp -d cargo-home.XXX)";
preBuild = ''
- export LIBCLANG_PATH=${llvmPackages.libclang}/lib
- export CPATH=${glibc_multi.dev}/include
- export CARGO_HOME=$(mktemp -d cargo-home.XXX)
+ export CPATH="${glibc_multi.dev}/include:${stdenv.cc.cc}/lib/gcc/$(cc -dumpmachine)/${lib.getVersion pkgsCross.arm-embedded.stdenv.cc.cc}/include"
cd example
'';
doCheck = false;
installPhase = ''
- mkdir -p $out/lib
- cp target/thumbv7em-none-eabi/release/example $out/lib/example.elf
+ mkdir -p $out/apps
+ cp ../target/thumbv7em-none-eabi/release/l0dable-example $out/apps/example.elf
'';
};
in {
--
GitLab