From: luhui <luhuins@163.com>
To: 48014@debbugs.gnu.org
Subject: [bug#48014] [PATCH] gnu: global: fix globash
Date: Sun, 25 Apr 2021 18:08:41 +0800 [thread overview]
Message-ID: <YIU/qVJk9Qhzq9NB@thinkpad-x230-luhui> (raw)
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: 0001-gnu-global-fix-globash.patch --]
[-- Type: text/plain, Size: 1892 bytes --]
From 2ec3b22edadb1db21a006d39f9998fd552d9110d Mon Sep 17 00:00:00 2001
From: luhui <luhuins@163.com>
Date: Sun, 25 Apr 2021 16:49:05 +0800
Subject: [PATCH] gnu: global: fix globash
* gnu/packages/code.scm (global)[#phases]: Add 'fix-globash'.
---
gnu/packages/code.scm | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index a79d8b4a2b..342ded76ff 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -15,6 +15,7 @@
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
+;;; Copyright © 2021 lu hui <luhuins@163.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -135,7 +136,8 @@ highlighting your own code that seemed comprehensible when you wrote it.")
(base32
"10vvsgx8v54whb4j9mk5qqyb5h3rdd9da0il3wir8pcpksyk0dww"))))
(build-system gnu-build-system)
- (inputs `(("ncurses" ,ncurses)
+ (inputs `(("coreutils" ,coreutils)
+ ("ncurses" ,ncurses)
("libltdl" ,libltdl)
("sqlite" ,sqlite)
("python-wrapper" ,python-wrapper)))
@@ -149,6 +151,13 @@ highlighting your own code that seemed comprehensible when you wrote it.")
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'fix-globash
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let* ((echo (string-append
+ (assoc-ref inputs "coreutils") "/bin/echo")))
+ (substitute* "globash/globash.in"
+ (("/bin/echo")
+ echo)))))
(add-after 'install 'post-install
(lambda* (#:key outputs #:allow-other-keys)
;; Install the plugin files in the right place.
--
2.31.1
next reply other threads:[~2021-04-25 14:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-25 10:08 luhui [this message]
2021-04-28 9:26 ` bug#48014: [PATCH] gnu: global: fix globash Efraim Flashner
2021-04-28 11:32 ` [bug#48014] " Maxime Devos
2021-04-28 11:38 ` Efraim Flashner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YIU/qVJk9Qhzq9NB@thinkpad-x230-luhui \
--to=luhuins@163.com \
--cc=48014@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.