nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: prosody: Add OpenSSL and Coreutils to the PATH of programs. 

* gnu/packages/messaging.scm (prosody)[arguments]: In 'wrap-programs'
phase, add 'openssl' and 'coreutils' to 'PATH'.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Clément Lassieur 2017-01-08 20:08:15 +01:00 committed by Ludovic Courtès
parent 9e3e972d1e
commit 5b4946180e
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gnu/packages/messaging.scm
View File

@ -7,7 +7,7 @@
;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 ng0 <ng0@libertad.pw> ;;; Copyright © 2016 ng0 <ng0@libertad.pw>
;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca> ;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2016, 2017 Clément Lassieur <clement@lassieur.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -39,6 +39,7 @@
#:use-module (gnu packages aidc) #:use-module (gnu packages aidc)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages avahi) #:use-module (gnu packages avahi)
#:use-module (gnu packages base)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages crypto) #:use-module (gnu packages crypto)
#:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages cyrus-sasl)
@ -546,22 +547,30 @@ end-to-end encryption support; XML console.")
(if (string-prefix? "lua" label) (if (string-prefix? "lua" label)
directory #f))) directory #f)))
inputs))) inputs)))
(path (string-join (lua-path (string-join
(map (lambda (path) (map (lambda (path)
(string-append path "/share/lua/5.1/?.lua;" (string-append
path "/share/lua/5.1/?.lua;"
path "/share/lua/5.1/?/?.lua")) path "/share/lua/5.1/?/?.lua"))
(cons out deps)) (cons out deps))
";")) ";"))
(cpath (string-join (lua-cpath (string-join
(map (lambda (path) (map (lambda (path)
(string-append path "/lib/lua/5.1/?.so;" (string-append
path "/lib/lua/5.1/?.so;"
path "/lib/lua/5.1/?/?.so")) path "/lib/lua/5.1/?/?.so"))
(cons out deps)) (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) (for-each (lambda (file)
(wrap-program file (wrap-program file
`("LUA_PATH" ";" = (,path)) `("LUA_PATH" ";" = (,lua-path))
`("LUA_CPATH" ";" = (,cpath)))) `("LUA_CPATH" ";" = (,lua-cpath))
`("PATH" ":" prefix ,path)))
(find-files bin ".*")) (find-files bin ".*"))
#t)))))) #t))))))
(inputs (inputs