Merge pull request #264012 from trofi/nxpmicro-mfgtools-fix-build

nxpmicro-mfgtools: drop conflicting patch

authored by Weijia Wang and committed by GitHub 5c996252 eaf8053a

-11
-11
pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix
··· 1 1 { lib, stdenv 2 2 , fetchFromGitHub 3 - , fetchpatch 4 3 , cmake 5 4 , pkg-config 6 5 , bzip2 ··· 21 20 rev = "uuu_${version}"; 22 21 sha256 = "sha256-f9Nt303xXZzLSu3GtOEpyaL91WVFUmKO7mxi8UNX3go="; 23 22 }; 24 - 25 - patches = [ 26 - # Backport upstream fix for gcc-13 support: 27 - # https://github.com/nxp-imx/mfgtools/pull/360 28 - (fetchpatch { 29 - name = "gcc-13.patch"; 30 - url = "https://github.com/nxp-imx/mfgtools/commit/24fd043225903247f71ac10666d820277c0b10b1.patch"; 31 - hash = "sha256-P7n6+Tiz10GIQ7QOd/qQ3BI7Wo5/66b0EwjFSpOUSJg="; 32 - }) 33 - ]; 34 23 35 24 nativeBuildInputs = [ cmake pkg-config installShellFiles ]; 36 25