diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-10-29 00:39:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-29 00:39:03 +0200 |
| commit | 5c996252bcd60a07158a568f688902dd44f89541 (patch) | |
| tree | 58d644813510687137d3cbaa32df91bb88d90b7f /pkgs | |
| parent | eaf8053ad50b8de818590fea529646983c16f5b4 (diff) | |
| parent | bc16a8dfd3ceeccd3ce68360bf37df683dabc7b4 (diff) | |
| download | nixpkgs-5c996252bcd60a07158a568f688902dd44f89541.tar nixpkgs-5c996252bcd60a07158a568f688902dd44f89541.tar.gz nixpkgs-5c996252bcd60a07158a568f688902dd44f89541.tar.bz2 nixpkgs-5c996252bcd60a07158a568f688902dd44f89541.tar.lz nixpkgs-5c996252bcd60a07158a568f688902dd44f89541.tar.xz nixpkgs-5c996252bcd60a07158a568f688902dd44f89541.tar.zst nixpkgs-5c996252bcd60a07158a568f688902dd44f89541.zip | |
Merge pull request #264012 from trofi/nxpmicro-mfgtools-fix-build
nxpmicro-mfgtools: drop conflicting patch
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix index 2145c9a249a..cfcd86f9dc2 100644 --- a/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix +++ b/pkgs/development/tools/misc/nxpmicro-mfgtools/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config , bzip2 @@ -22,16 +21,6 @@ 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 ]; |