From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Subject: [PATCH 3/3] gnu: prosody: Make config and data files visible to 'prosodyctl'. Date: Sun, 8 Jan 2017 20:08:16 +0100 Message-ID: <20170108190816.25185-3-clement@lassieur.org> References: <874m19qslw.fsf@lassieur.org> <20170108190816.25185-1-clement@lassieur.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49212) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cQIpd-0000VE-PN for guix-devel@gnu.org; Sun, 08 Jan 2017 14:08:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cQIpZ-0006v7-Pm for guix-devel@gnu.org; Sun, 08 Jan 2017 14:08:41 -0500 Received: from mail.lassieur.org ([83.152.10.219]:44098) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cQIpZ-0006up-FK for guix-devel@gnu.org; Sun, 08 Jan 2017 14:08:37 -0500 Received: from localhost.localdomain (gateway [192.168.0.254]) by mail.lassieur.org (Postfix) with ESMTPSA id EC51964018B for ; Sun, 8 Jan 2017 20:08:35 +0100 (CET) In-Reply-To: <20170108190816.25185-1-clement@lassieur.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * gnu/packages/messaging.scm (prosody)[arguments]: Add a 'fix-makefile' phase. --- gnu/packages/messaging.scm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 86ff61538..6f1025d36 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -536,6 +536,14 @@ end-to-end encryption support; XML console.") (substitute* "configure" (("exit 1") "")) #t)) + (add-after 'unpack 'fix-makefile + (lambda _ + (substitute* "Makefile" + ;; prosodyctl needs to read the configuration file. + (("^INSTALLEDCONFIG =.*") "INSTALLEDCONFIG = /etc/prosody\n") + ;; prosodyctl needs a place to put auto-generated certificates. + (("^INSTALLEDDATA =.*") "INSTALLEDDATA = /var/lib/prosody\n")) + #t)) (add-after 'install 'wrap-programs (lambda* (#:key inputs outputs #:allow-other-keys) ;; Make sure all executables in "bin" find the required Lua -- 2.11.0