diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-10-28 19:45:03 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2023-10-28 19:45:03 +0100 |
| commit | bc16a8dfd3ceeccd3ce68360bf37df683dabc7b4 (patch) | |
| tree | 5a6b7435ba480a28a67f8d8a2ee2e7544a4b741c | |
| parent | Merge pull request #263033 from ElvishJerricco/systemd-stage-1-filesystems-en... (diff) | |
| download | nixpkgs-bc16a8dfd3ceeccd3ce68360bf37df683dabc7b4.tar.gz | |
nxpmicro-mfgtools: drop conflicting patch
Fixed build failure reported by SoRoot.
Closes: https://github.com/NixOS/nixpkgs/issues/264006
| -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 2145c9a249a0..cfcd86f9dc2b 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 ]; |