From 8edba0e2177c3fa29de034bc25c60fbc08110ab2 Mon Sep 17 00:00:00 2001 From: toonn Date: Fri, 22 Oct 2021 21:09:55 +0200 Subject: [PATCH] groonga: Switch to autoreconfHook Use `autoreconfHook` rather than manually running `aclocal`. Clarify removal of `version` file. --- pkgs/servers/search/groonga/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 34c46f5b6494..037bf96ab7b9 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -1,8 +1,7 @@ -{ lib, stdenv, fetchurl, mecab, kytea, libedit, pkg-config +{ lib, stdenv, fetchurl, autoreconfHook, mecab, kytea, libedit, pkg-config , suggestSupport ? false, zeromq, libevent, msgpack , lz4Support ? false, lz4 , zlibSupport ? false, zlib -, autoconf, automake }: stdenv.mkDerivation rec { @@ -16,8 +15,8 @@ stdenv.mkDerivation rec { }; preConfigure = '' + # To avoid problems due to libc++abi 11 using `#include `. rm version - aclocal ''; buildInputs = with lib; @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { ++ optional zlibSupport zlib ++ optionals suggestSupport [ zeromq libevent msgpack ]; - nativeBuildInputs = [ autoconf automake pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = with lib; optional zlibSupport "--with-zlib"