From 5e5cb9e12400a358267d76b6b8bcdc01b827b857 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 25 Jul 2025 15:08:27 +0200 Subject: [PATCH] charybdis: unpin autotools --- pkgs/servers/irc/charybdis/default.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index 1b9dc0757466..52235a2e3a97 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchurl, autoreconfHook, bison, flex, @@ -20,6 +21,13 @@ stdenv.mkDerivation rec { sha256 = "1lndk0yp27qm8bds4jd204ynxcq92fqmpfb0kkcla5zgky3miks3"; }; + patches = [ + (fetchurl { + url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/d13eb723d7e9512fb2f2516e5934bd927a92eb2c/community/charybdis/fix-missing-include.patch"; + hash = "sha256-8JXYuIjoHQg+l33OjseF5nnd5ZPagBA2/bSa3Il5Te4="; + }) + ]; + postPatch = '' substituteInPlace include/defaults.h --replace 'PKGLOCALSTATEDIR "' '"/var/lib/charybdis' substituteInPlace include/defaults.h --replace 'ETCPATH "' '"/etc/charybdis' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 230e160b992a..682cf2680031 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10156,9 +10156,7 @@ with pkgs; dnsutils = bind.dnsutils; dig = lib.addMetaAttrs { mainProgram = "dig"; } bind.dnsutils; - charybdis = callPackage ../servers/irc/charybdis { - autoreconfHook = buildPackages.autoreconfHook269; - }; + charybdis = callPackage ../servers/irc/charybdis { }; clickhouse-cli = with python3Packages; toPythonApplication clickhouse-cli;