sensor: fix Nix build

Author: lopsided98

sensor/default.nix

@@ -1,48 +1,59 @@
 {
-  stdenv,
+  stdenvNoCC,
+  lib,
   callPackage,
   python3Packages,
-  git,
   cmake,
-  ninja,
   gcc-arm-embedded,
+  dtc,
 }:
 
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   pname = "water-level-sensor";
-  version = "0.1.0";
+  version = "0.2.0";
 
   src = callPackage ./firmware/west.nix { };
 
   nativeBuildInputs = [
-    git
     cmake
-    ninja
     gcc-arm-embedded
+    dtc
   ]
   ++ (with python3Packages; [
-    west
+    packaging
     pyelftools
+    pykwalify
+    pyyaml
+    jsonschema
   ]);
 
-  GNUARMEMB_TOOLCHAIN_PATH = gcc-arm-embedded;
-
-  dontConfigure = true;
-
-  buildPhase = ''
-    runHook preBuild
-
-    west build -b nrf51_ble400 firmware -- -DZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb -DUSER_CACHE_DIR="$(pwd)/.cache"
-    cat .west/config
-
-    runHook postBuild
+  env =
+    let
+      tool = name: "${lib.getBin gcc-arm-embedded}/bin/arm-none-eabi-${name}";
+    in
+    {
+      ZEPHYR_TOOLCHAIN_VARIANT = "gnuarmemb";
+      GNUARMEMB_TOOLCHAIN_PATH = gcc-arm-embedded;
+      STRIP = tool "strip";
+      RANLIB = tool "ranlib";
+      AR = tool "ar";
+      CC = tool "gcc";
+      CXX = tool "g++";
+    };
+
+  cmakeDir = "../firmware";
+
+  preConfigure = ''
+    export XDG_CACHE_HOME="$TMPDIR"
+    source .zephyr-env
+    cmakeFlagsArray+=("-DBUILD_VERSION=$ZEPHYR_BUILD_VERSION")
   '';
 
   installPhase = ''
     runHook preInstall
 
     mkdir -p "$out"
-    cp build/zephyr/zephyr.elf "$out"
+    cp zephyr/zephyr.{elf,bin,hex,map} "$out"
 
     runHook postInstall
   '';

sensor/firmware/west.nix

@@ -85,8 +85,9 @@ nativeBuildInputs = [ lndir ];
         })} \
         "$out"/'modules/hal/nordic/zephyr/blobs/suit/bin/suit_manifest_starter.hex'
 
-    cat << EOF > "$out/.zephyr-env"
-    export ZEPHYR_BASE=${lib.escapeShellArg "${placeholder "out"}/zephyr"}
-    export ZEPHYR_MODULES=${lib.escapeShellArg "${placeholder "out"}/firmware;${placeholder "out"}/modules/hal/cmsis_6;${placeholder "out"}/modules/hal/nordic;${placeholder "out"}/modules/crypto/mbedtls;${placeholder "out"}/modules/crypto/tf-psa-crypto"}
-    EOF
+cat << EOF > "$out/.zephyr-env"
+export ZEPHYR_BASE=${lib.escapeShellArg "${placeholder "out"}/zephyr"}
+export ZEPHYR_MODULES=${lib.escapeShellArg "${placeholder "out"}/firmware;${placeholder "out"}/modules/hal/cmsis_6;${placeholder "out"}/modules/hal/nordic;${placeholder "out"}/modules/crypto/mbedtls;${placeholder "out"}/modules/crypto/tf-psa-crypto"}
+export ZEPHYR_BUILD_VERSION=${lib.escapeShellArg "v4.4.0-1-g487d489b6f0a"}
+EOF
 ''

sensor/shell.nix

@@ -13,7 +13,9 @@
 
 mkShell {
   name = "water-level-monitor-env";
+
   disableHardening = [ "all" ];
+
   nativeBuildInputs = [
     which
     git
@@ -33,5 +35,5 @@ mkShell {
     jsonschema
   ]);
 
-  GNUARMEMB_TOOLCHAIN_PATH = gcc-arm-embedded;
+  env.GNUARMEMB_TOOLCHAIN_PATH = gcc-arm-embedded;
 }