From e1edaedd8a34ff4ae73331094c631f366299b7c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 5 Apr 2024 19:03:08 +0200 Subject: [PATCH 1/2] dovecot_fts_xapian: cleanup --- pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index 87bdddc690b2..60422d91799c 100644 --- a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, sqlite, pkg-config, dovecot, libtool, xapian, icu64 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, sqlite, pkg-config, dovecot, xapian, icu }: + stdenv.mkDerivation rec { pname = "dovecot-fts-xapian"; version = "1.7.10"; @@ -10,13 +11,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-Gzr0365lY9wAvmXeVungD2z44WHC+AI0a1xLWy3mCK4="; }; - buildInputs = [ dovecot xapian icu64 sqlite ]; + buildInputs = [ xapian icu sqlite ]; - nativeBuildInputs = [ autoconf automake libtool pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; preConfigure = '' export PANDOC=false - autoreconf -vi ''; configureFlags = [ From 91f98c6b216e4e5b5f4781e749e6273240849ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 5 Apr 2024 19:03:20 +0200 Subject: [PATCH 2/2] dovecot_fts_xapian: fix hash --- pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index 60422d91799c..29de85fa9914 100644 --- a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "grosjo"; repo = "fts-xapian"; rev = version; - sha256 = "sha256-Gzr0365lY9wAvmXeVungD2z44WHC+AI0a1xLWy3mCK4="; + hash = "sha256-Yd14kla33qAx4Hy0ZdE08javvki3t+hCEc3OTO6YfkQ="; }; buildInputs = [ xapian icu sqlite ];