From 81771b203534de099edeef165ae12b59e9c5398a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 25 Jul 2025 14:55:56 +0200 Subject: [PATCH] solanum: unpin autotools --- pkgs/servers/irc/solanum/default.nix | 12 ++++++++++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/irc/solanum/default.nix b/pkgs/servers/irc/solanum/default.nix index ac3793dd43bc..796809cf5173 100644 --- a/pkgs/servers/irc/solanum/default.nix +++ b/pkgs/servers/irc/solanum/default.nix @@ -1,7 +1,9 @@ { lib, stdenv, - autoreconfHook, + autoconf, + automake, + libtool, bison, fetchFromGitHub, flex, @@ -33,6 +35,10 @@ stdenv.mkDerivation { substituteInPlace include/defaults.h --replace 'ETCPATH "' '"/etc/solanum' ''; + preConfigure = '' + ./autogen.sh + ''; + configureFlags = [ "--enable-epoll" "--enable-ipv6" @@ -47,7 +53,9 @@ stdenv.mkDerivation { ]; nativeBuildInputs = [ - autoreconfHook + autoconf + automake + libtool bison flex pkg-config diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0563255a989d..21183412b278 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4377,9 +4377,7 @@ with pkgs; stm32loader = with python3Packages; toPythonApplication stm32loader; - solanum = callPackage ../servers/irc/solanum { - autoreconfHook = buildPackages.autoreconfHook269; - }; + solanum = callPackage ../servers/irc/solanum { }; solc-select = with python3Packages; toPythonApplication solc-select;