Unverified Commit f50e815c authored by Stefan Frijters's avatar Stefan Frijters
Browse files

mkspiffs: fix cross

parent 29a55e18

pkgs/tools/filesystems/mkspiffs/default.nix

+11 −1
Original line number Diff line number Diff line
@@ -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

  '';