From 9460529b21618f648bef184aede27cf89c63e8d7 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Tue, 12 Nov 2024 05:23:41 -0800 Subject: [PATCH] aspell: fix clang-19 with upstream patch https://github.com/GNUAspell/aspell/commit/ee6cbb12ff36a1e6618d7388a78dd4e0a2b44041 --- pkgs/development/libraries/aspell/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index 8c152d32ef6c..c5ac805f6be5 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchzip, perl, ncurses +{ lib, stdenv, fetchpatch, fetchurl, fetchzip, perl, ncurses # for tests , aspell, glibc, runCommand @@ -27,7 +27,14 @@ stdenv.mkDerivation rec { hash = "sha256-1toSs01C1Ff6YE5DWtSEp0su/80SD/QKzWuz+yiH0hs="; }; - patches = lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch; + patches = [ + # fix gcc-15 / clang-19 build. can remove on next update + (fetchpatch { + name = "fix-gcc-15-build.patch"; + url = "https://github.com/GNUAspell/aspell/commit/ee6cbb12ff36a1e6618d7388a78dd4e0a2b44041.patch"; + hash = "sha256-rW1FcfARdtT4wX+zGd2x/1K8zRp9JZhdR/zRd8RwPZA="; + }) + ] ++ lib.optional searchNixProfiles ./data-dirs-from-nix-profiles.patch; postPatch = '' patch interfaces/cc/aspell.h < ${./clang.patch}