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 <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I06bed3a218f8c15247d9aebed1f569cc61b378b6
This commit is contained in:
Maxime Devos 2021-07-02 12:06:35 +02:00 committed by Ludovic Courtès
parent c7276d752e
commit 261c7692e4
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5

View file

@ -20779,7 +20779,8 @@ hidden.")
"08gygn9fjank5gpi4v6ynrkn0jbknxbwsn7md4p9ndygdbmnkf98")))) "08gygn9fjank5gpi4v6ynrkn0jbknxbwsn7md4p9ndygdbmnkf98"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(inputs (inputs
(list emacs-ansi (list bash-minimal
emacs-ansi
emacs-commander emacs-commander
emacs-dash emacs-dash
emacs-f emacs-f
@ -20802,8 +20803,8 @@ hidden.")
;; Do not capture the transient source directory in ;; Do not capture the transient source directory in
;; the wrapper. ;; the wrapper.
(delete source-directory (delete source-directory
(string-split (getenv "EMACSLOADPATH") #\:)))) (string-split (getenv "EMACSLOADPATH")
#t)))) #\:))))))))
#:include (cons* "^reporters/.*\\.el$" %default-include))) #:include (cons* "^reporters/.*\\.el$" %default-include)))
(home-page "https://github.com/rejeep/ert-runner.el") (home-page "https://github.com/rejeep/ert-runner.el")
(synopsis "Opinionated Ert testing workflow") (synopsis "Opinionated Ert testing workflow")
@ -30729,7 +30730,8 @@ asynchronous communications, the RPC response is fairly good.")
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system emacs-build-system) (build-system emacs-build-system)
(inputs (inputs
(list perl (list bash-minimal
perl
perl-rpc-epc-service perl-rpc-epc-service
perl-dbi perl-dbi
;; TODO: Adding support for perl-dbd-mysql and others would ;; TODO: Adding support for perl-dbd-mysql and others would
@ -30745,8 +30747,7 @@ asynchronous communications, the RPC response is fairly good.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((perl (assoc-ref inputs "perl"))) (let ((perl (assoc-ref inputs "perl")))
(substitute* "edbi.el" (substitute* "edbi.el"
(("\"perl\"") (string-append "\"" perl "/bin/perl\""))) (("\"perl\"") (string-append "\"" perl "/bin/perl\""))))))
#t)))
(add-after 'wrap 'wrap-edbi-bridge (add-after 'wrap 'wrap-edbi-bridge
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -30754,8 +30755,7 @@ asynchronous communications, the RPC response is fairly good.")
"/edbi-bridge.pl"))) "/edbi-bridge.pl")))
(chmod bridge #o555) (chmod bridge #o555)
(wrap-program bridge (wrap-program bridge
`("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))))) `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))))))))))
#t)))))
(synopsis "Database Interface for Emacs Lisp") (synopsis "Database Interface for Emacs Lisp")
(description "This program connects the database server through Perl's (description "This program connects the database server through Perl's
DBI, and provides DB-accessing API and the simple management UI.") DBI, and provides DB-accessing API and the simple management UI.")