diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-10-25 21:04:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-25 21:04:15 -0500 |
| commit | 8055e6795ec6cad88f2f95b0cd29ef1c9fbeac4f (patch) | |
| tree | da6245d9bef03d25cf3a95e5cc2525a180785e5f | |
| parent | c0e2004980090832795d25551f7afad02cc41eaa (diff) | |
| parent | 945337f01fbb7512703ac89e97c3128735a7a14c (diff) | |
| download | nixlib-8055e6795ec6cad88f2f95b0cd29ef1c9fbeac4f.tar nixlib-8055e6795ec6cad88f2f95b0cd29ef1c9fbeac4f.tar.gz nixlib-8055e6795ec6cad88f2f95b0cd29ef1c9fbeac4f.tar.bz2 nixlib-8055e6795ec6cad88f2f95b0cd29ef1c9fbeac4f.tar.lz nixlib-8055e6795ec6cad88f2f95b0cd29ef1c9fbeac4f.tar.xz nixlib-8055e6795ec6cad88f2f95b0cd29ef1c9fbeac4f.tar.zst nixlib-8055e6795ec6cad88f2f95b0cd29ef1c9fbeac4f.zip | |
Merge pull request #261251 from trofi/nxpmicro-mfgtools-gcc-13-fix
nxpmicro-mfgtools: pull upstream fix for gcc-13
| -rw-r--r-- | pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix index cfcd86f9dc2b..2145c9a249a0 100644 --- 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 ]; |