mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
gnu: lsh: 'lsh-authorize' uses the absolute file name of 'sexp-conv'.
Fixes <http://bugs.gnu.org/21516>. Reported by Andreas Enge <andreas@enge.fr>. * gnu/packages/lsh.scm (lsh)[arguments]: In 'pre-configure' phase, change 'src/lsh-authorize' to use the absolute file name of 'sexp-conv'.
This commit is contained in:
parent
30d9aa5422
commit
0b1f0d36b1
1 changed files with 12 additions and 7 deletions
|
@ -116,14 +116,19 @@ (define-public lsh
|
|||
(alist-cons-before
|
||||
'configure 'pre-configure
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; Make sure 'lsh' and 'lshd' pick 'sexp-conv' in the right place by
|
||||
;; default.
|
||||
(substitute* "src/environ.h.in"
|
||||
(("^#define PATH_SEXP_CONV.*")
|
||||
(let* ((nettle (assoc-ref inputs "nettle"))
|
||||
(sexp-conv (string-append nettle "/bin/sexp-conv")))
|
||||
(let* ((nettle (assoc-ref inputs "nettle"))
|
||||
(sexp-conv (string-append nettle "/bin/sexp-conv")))
|
||||
;; Make sure 'lsh' and 'lshd' pick 'sexp-conv' in the right place
|
||||
;; by default.
|
||||
(substitute* "src/environ.h.in"
|
||||
(("^#define PATH_SEXP_CONV.*")
|
||||
(string-append "#define PATH_SEXP_CONV \""
|
||||
sexp-conv "\"\n"))))
|
||||
sexp-conv "\"\n")))
|
||||
|
||||
;; Same for the 'lsh-authorize' script.
|
||||
(substitute* "src/lsh-authorize"
|
||||
(("=sexp-conv")
|
||||
(string-append "=" sexp-conv))))
|
||||
|
||||
;; Tests rely on $USER being set.
|
||||
(setenv "USER" "guix"))
|
||||
|
|
Loading…
Reference in a new issue