From patchwork Thu Aug 27 15:17:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Abramov X-Patchwork-Id: 23798 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BFAD827BBE5; Thu, 27 Aug 2020 16:19:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E0A5B27BBE7 for ; Thu, 27 Aug 2020 16:19:10 +0100 (BST) Received: from localhost ([::1]:35228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBJgE-0002L2-Bh for patchwork@mira.cbaines.net; Thu, 27 Aug 2020 11:19:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBJg7-0002KA-9k for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60355) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kBJg7-0004cj-0J for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kBJg6-0007gs-SG for guix-patches@gnu.org; Thu, 27 Aug 2020 11:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42899] [PATCH v3 1/9] gnu: dovecot: Set moduledir to global directory. References: <20200817092748.30057-1-levenson@mmer.org> In-Reply-To: <20200817092748.30057-1-levenson@mmer.org> Resent-From: Alexey Abramov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Aug 2020 15:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42899 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42899@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 42899-submit@debbugs.gnu.org id=B42899.159854148829442 (code B ref 42899); Thu, 27 Aug 2020 15:19:02 +0000 Received: (at 42899) by debbugs.gnu.org; 27 Aug 2020 15:18:08 +0000 Received: from localhost ([127.0.0.1]:43654 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJfE-0007ej-57 for submit@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:08 -0400 Received: from mx4.mail.mmer.org ([178.22.66.29]:53039) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kBJf6-0007dF-Uh for 42899@debbugs.gnu.org; Thu, 27 Aug 2020 11:18:03 -0400 Received: from delta (92-109-1-225.cable.dynamic.v4.ziggo.nl [92.109.1.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx4.mail.mmer.org (Postfix) with ESMTPSA id 285369CD66; Thu, 27 Aug 2020 14:47:13 +0000 (UTC) From: Alexey Abramov Date: Thu, 27 Aug 2020 17:17:35 +0200 Message-Id: <20200827151743.27712-1-levenson@mmer.org> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Efraim Flashner * gnu/packages/mail.scm (dovecot)[arguments]: Add configure-flag to set moduledir. Adjust custom 'install phase to override moduledir so it successfully installs. --- gnu/packages/mail.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 81dc5b8eec..c22dd27547 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1444,7 +1444,8 @@ facilities for checking incoming mail.") `(#:configure-flags '("--sysconfdir=/etc" "--localstatedir=/var" "--with-sqlite" ; not auto-detected - "--with-lucene") ; not auto-detected + "--with-lucene" ; not auto-detected + "--with-moduledir=/etc/dovecot/modules") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-file-names @@ -1461,9 +1462,13 @@ facilities for checking incoming mail.") (("cat") (which "cat"))) #t)) (replace 'install - (lambda* (#:key make-flags #:allow-other-keys) + (lambda* (#:key outputs make-flags #:allow-other-keys) + ;; The .la files don't like having the moduledir moved. + (for-each delete-file (find-files "." "\\.la")) ;; Simple hack to avoid installing a trivial README in /etc. (apply invoke "make" "install" "sysconfdir=/tmp/bogus" + (string-append "moduledir=" (assoc-ref outputs "out") + "/lib/dovecot") make-flags)))))) (home-page "https://www.dovecot.org") (synopsis "Secure POP3/IMAP server")