From 261c7692e41f7c977d01a61b31269dc3aba61da7 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Fri, 2 Jul 2021 12:06:35 +0200 Subject: [PATCH] gnu: emacs-xyz: Add 'bash' input for 'wrap-program'. It is required for cross-compilation. * gnu/packages/emacs-xyz.scm (emacs-ert-runner)[inputs]: Add 'bash-minimal'. (emacs-edbi)[inputs]: Likewise. Signed-off-by: Maxim Cournoyer Modified-by: Maxim Cournoyer Change-Id: I06bed3a218f8c15247d9aebed1f569cc61b378b6 --- gnu/packages/emacs-xyz.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 47f7a1372d..7d83cc7bf2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20779,7 +20779,8 @@ (define-public emacs-ert-runner "08gygn9fjank5gpi4v6ynrkn0jbknxbwsn7md4p9ndygdbmnkf98")))) (build-system emacs-build-system) (inputs - (list emacs-ansi + (list bash-minimal + emacs-ansi emacs-commander emacs-dash emacs-f @@ -20802,8 +20803,8 @@ (define-public emacs-ert-runner ;; Do not capture the transient source directory in ;; the wrapper. (delete source-directory - (string-split (getenv "EMACSLOADPATH") #\:)))) - #t)))) + (string-split (getenv "EMACSLOADPATH") + #\:)))))))) #:include (cons* "^reporters/.*\\.el$" %default-include))) (home-page "https://github.com/rejeep/ert-runner.el") (synopsis "Opinionated Ert testing workflow") @@ -30729,7 +30730,8 @@ (define-public emacs-edbi (file-name (git-file-name name version)))) (build-system emacs-build-system) (inputs - (list perl + (list bash-minimal + perl perl-rpc-epc-service perl-dbi ;; TODO: Adding support for perl-dbd-mysql and others would @@ -30745,8 +30747,7 @@ (define-public emacs-edbi (lambda* (#:key inputs #:allow-other-keys) (let ((perl (assoc-ref inputs "perl"))) (substitute* "edbi.el" - (("\"perl\"") (string-append "\"" perl "/bin/perl\""))) - #t))) + (("\"perl\"") (string-append "\"" perl "/bin/perl\"")))))) (add-after 'wrap 'wrap-edbi-bridge (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -30754,8 +30755,7 @@ (define-public emacs-edbi "/edbi-bridge.pl"))) (chmod bridge #o555) (wrap-program bridge - `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))))) - #t))))) + `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB")))))))))) (synopsis "Database Interface for Emacs Lisp") (description "This program connects the database server through Perl's DBI, and provides DB-accessing API and the simple management UI.")