From c01d16f985b15d9cf64b96de4e627a62d13ac8f6 Mon Sep 17 00:00:00 2001 From: Astro <astro@spaceboyz.net> Date: Thu, 22 Aug 2019 17:21:25 +0200 Subject: [PATCH] nix fixes --- default.nix | 2 +- l0dable/src/lib.rs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 5919f2a6..92bc96b4 100644 --- a/default.nix +++ b/default.nix @@ -27,7 +27,7 @@ let version = "0.0.0"; src = ./.; cargoSha256 = "10qv30p3kr570glnyn37b6r8pgx48zj0mr9qf84m4wk4sjp3wxsd"; - buildInputs = [ pkgsCross.armhf-embedded.stdenv.cc ]; + buildInputs = [ pkgsCross.armhf-embedded.stdenv.cc glibc_multi ]; prePatch = '' cp ${epic-stubs}/client.c l0dable/src/ ''; diff --git a/l0dable/src/lib.rs b/l0dable/src/lib.rs index 10260663..1b46bb3c 100644 --- a/l0dable/src/lib.rs +++ b/l0dable/src/lib.rs @@ -44,6 +44,8 @@ pub unsafe extern "C" fn Reset_Handler() -> ! { pub mod ctypes { #![allow(non_camel_case_types)] + pub type c_short = i16; + pub type c_ushort = u16; pub type c_int = i32; pub type c_uint = u32; pub type c_long = i32; @@ -51,6 +53,8 @@ pub mod ctypes { pub type c_longlong = i64; pub type c_ulonglong = u64; pub type c_char = u8; + pub type c_schar = i8; + pub type c_uchar = u8; pub use core::ffi::c_void; } -- GitLab