Merge pull request NixOS#261251 from trofi/nxpmicro-mfgtools-gcc-13-fix

nxpmicro-mfgtools: pull upstream fix for gcc-13
khaneliman · Oct 26, 2023 · 8055e67 · 8055e67
2 parents c0e2004 + 945337f
commit 8055e67
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
@@ -1,5 +1,6 @@
 { lib, stdenv
 , fetchFromGitHub
+, fetchpatch
 , cmake
 , pkg-config
 , bzip2
@@ -21,6 +22,16 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-f9Nt303xXZzLSu3GtOEpyaL91WVFUmKO7mxi8UNX3go=";
   };
 
+  patches = [
+    # Backport upstream fix for gcc-13 support:
+    #   https://github.com/nxp-imx/mfgtools/pull/360
+    (fetchpatch {
+      name = "gcc-13.patch";
+      url = "https://github.com/nxp-imx/mfgtools/commit/24fd043225903247f71ac10666d820277c0b10b1.patch";
+      hash = "sha256-P7n6+Tiz10GIQ7QOd/qQ3BI7Wo5/66b0EwjFSpOUSJg=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake pkg-config installShellFiles ];
 
   buildInputs = [ bzip2 libusb1 libzip openssl zstd ];