diff options
| author | toonn <toonn@toonn.io> | 2021-10-22 21:09:55 +0200 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-11-24 15:17:13 -0800 |
| commit | 8edba0e2177c3fa29de034bc25c60fbc08110ab2 (patch) | |
| tree | 62eaa413b9cfae181ebe28a5fc0f5c83fce7c2bc /pkgs/servers/search/groonga | |
| parent | 787a8b85fb34d0a84facd7f89245b0ac9a7ed7c0 (diff) | |
| download | nixpkgs-8edba0e2177c3fa29de034bc25c60fbc08110ab2.tar nixpkgs-8edba0e2177c3fa29de034bc25c60fbc08110ab2.tar.gz nixpkgs-8edba0e2177c3fa29de034bc25c60fbc08110ab2.tar.bz2 nixpkgs-8edba0e2177c3fa29de034bc25c60fbc08110ab2.tar.lz nixpkgs-8edba0e2177c3fa29de034bc25c60fbc08110ab2.tar.xz nixpkgs-8edba0e2177c3fa29de034bc25c60fbc08110ab2.tar.zst nixpkgs-8edba0e2177c3fa29de034bc25c60fbc08110ab2.zip | |
groonga: Switch to autoreconfHook
Use `autoreconfHook` rather than manually running `aclocal`. Clarify removal of `version` file.
Diffstat (limited to 'pkgs/servers/search/groonga')
| -rw-r--r-- | pkgs/servers/search/groonga/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 34c46f5b649..037bf96ab7b 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 <version>`. 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" |