~ruther/guix-local

0b1f0d36b1219710d6e9e1cd15fbabe729d374e0 — Ludovic Courtès 10 years ago 30d9aa5
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'.
1 files changed, 12 insertions(+), 7 deletions(-)

M gnu/packages/lsh.scm
M gnu/packages/lsh.scm => gnu/packages/lsh.scm +12 -7
@@ 116,14 116,19 @@ basis for almost any application.")
       (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"))