From f50e815cabc4bd760bf7e727096e47fdb9e89124 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sat, 3 May 2025 09:42:16 +0200
Subject: [PATCH] mkspiffs: fix cross

---
 pkgs/tools/filesystems/mkspiffs/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/mkspiffs/default.nix b/pkgs/tools/filesystems/mkspiffs/default.nix
index cf625ee105ff..0d19a8f1db23 100644
--- a/pkgs/tools/filesystems/mkspiffs/default.nix
+++ b/pkgs/tools/filesystems/mkspiffs/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  pkgsBuildHost,
 }:
 
 # Changing the variables CPPFLAGS and BUILD_CONFIG_NAME can be done by
@@ -19,11 +20,18 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-oa6Lmo2yb66IjtEKkZyJBgM/p7rdvmrKfgNd2rAM/Lk=";
   };
 
+  # 1) Fix build for Darwin
+  # 2) Fix cross
+  # 3) Do not run test as part of the buildPhase - the checkPhase will run it as `make test`
   postPatch = ''
     substituteInPlace Makefile \
-      --replace-fail "-arch i386 -arch x86_64" ""
+      --replace-fail "-arch i386 -arch x86_64" "" \
+      --replace-fail "strip" "${pkgsBuildHost.binutils.targetPrefix}strip" \
+      --replace-fail "dist: test" ""
   '';
 
+  strictDeps = true;
+
   buildFlags = [ "dist" ];
 
   makeFlags = [
@@ -31,6 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
     "SPIFFS_VERSION=unknown"
   ];
 
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
   installPhase = ''
     install -Dm755 -t $out/bin mkspiffs
   '';