From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Subject: [PATCH 2/3] gnu: prosody: Fix inputs. Date: Sun, 8 Jan 2017 20:08:15 +0100 Message-ID: <20170108190816.25185-2-clement@lassieur.org> References: <874m19qslw.fsf@lassieur.org> <20170108190816.25185-1-clement@lassieur.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49206) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cQIpc-0000VC-UL 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-0006vD-Rs for guix-devel@gnu.org; Sun, 08 Jan 2017 14:08:40 -0500 Received: from mail.lassieur.org ([83.152.10.219]:44096) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cQIpZ-0006un-H7 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 DC1F764017F 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)[inputs]: Add coreutils. [arguments]: In 'wrap-programs' phase, add 'openssl' and 'coreutils' to 'PATH'. --- gnu/packages/messaging.scm | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 95c265b98..86ff61538 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -7,7 +7,7 @@ ;;; Copyright =C2=A9 2015 Efraim Flashner ;;; Copyright =C2=A9 2016 ng0 ;;; Copyright =C2=A9 2016 Andy Patterson -;;; Copyright =C2=A9 2016 Cl=C3=A9ment Lassieur +;;; Copyright =C2=A9 2016, 2017 Cl=C3=A9ment Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,6 +39,7 @@ #:use-module (gnu packages aidc) #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) + #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages crypto) #:use-module (gnu packages cyrus-sasl) @@ -546,27 +547,36 @@ end-to-end encryption support; XML console.") (if (string-prefix? "lua" = label) directory #f))) inputs))) - (path (string-join - (map (lambda (path) - (string-append path "/share/lua/5.1/?= .lua;" - path "/share/lua/5.1/?= /?.lua")) - (cons out deps)) - ";")) - (cpath (string-join - (map (lambda (path) - (string-append path "/lib/lua/5.1/?.s= o;" - path "/lib/lua/5.1/?/?= .so")) - (cons out deps)) - ";"))) + (lua-path (string-join + (map (lambda (path) + (string-append + path "/share/lua/5.1/?.lua;" + path "/share/lua/5.1/?/?.lua")) + (cons out deps)) + ";")) + (lua-cpath (string-join + (map (lambda (path) + (string-append + path "/lib/lua/5.1/?.so;" + path "/lib/lua/5.1/?/?.so")) + (cons out deps)) + ";")) + (openssl (assoc-ref inputs "openssl")) + (coreutils (assoc-ref inputs "coreutils")) + (path (map (lambda (dir) + (string-append dir "/bin")) + (list openssl coreutils)))) (for-each (lambda (file) (wrap-program file - `("LUA_PATH" ";" =3D (,path)) - `("LUA_CPATH" ";" =3D (,cpath)))) + `("LUA_PATH" ";" =3D (,lua-path)) + `("LUA_CPATH" ";" =3D (,lua-cpath)) + `("PATH" ":" prefix ,path))) (find-files bin ".*")) #t)))))) (inputs `(("libidn" ,libidn) ("openssl" ,openssl) + ("coreutils" ,coreutils) ; For chmod in certificate generation. ("lua" ,lua-5.1) ("lua5.1-expat" ,lua5.1-expat) ("lua5.1-socket" ,lua5.1-socket) --=20 2.11.0