diff options
author | Ludovic Courtès <ludo@gnu.org> | 2021-04-29 15:41:48 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2021-04-29 15:41:48 +0200 |
commit | 2c11e7be745a790320a42a357635997310d731d0 (patch) | |
tree | 226aafaccf6f77758ab6e0e174ff8f08318a1772 /gnu/packages/code.scm | |
parent | e12210dc92098d8581cea3007d57dbb6be16bb41 (diff) | |
parent | 041d62f7cc244d7f6c0bd6d60cdf08e72d400313 (diff) |
Merge remote-tracking branch 'origin/master' into wip-ungrafting
Diffstat (limited to 'gnu/packages/code.scm')
-rw-r--r-- | gnu/packages/code.scm | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index a79d8b4a2b..25c8064993 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,12 @@ 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. |