mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-07 03:20:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: readline: Remove input labels.

Browse source 
* gnu/packages/readline.scm (readline)[arguments]: Convert to G-expression.
Don't look up inputs by label.
This commit is contained in:
Marius Bakke 2022-06-26 15:06:14 +02:00
parent 9881ff7324
commit 1c3fe0e491
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
gnu/packages/readline.scm
View file

@ -3,7 +3,7 @@
;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -27,6 +27,7 @@
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix gexp)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
@ -80,27 +81,30 @@
(patch-flags '("-p0")))) (patch-flags '("-p0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (list ncurses)) (propagated-inputs (list ncurses))
(arguments `(#:configure-flags (arguments
(list (string-append "LDFLAGS=-Wl,-rpath -Wl," (list #:configure-flags
(assoc-ref %build-inputs "ncurses") #~(list (string-append
"/lib") "LDFLAGS=-Wl,-rpath -Wl,"
(dirname (search-input-file %build-inputs
"lib/libncurses.so")))
;; This test does an 'AC_TRY_RUN', which aborts when ;; This test does an 'AC_TRY_RUN', which aborts when
;; cross-compiling, so provide the correct answer. ;; cross-compiling, so provide the correct answer.
,@(if (%current-target-system) #$@(if (%current-target-system)
'("bash_cv_wcwidth_broken=no") '("bash_cv_wcwidth_broken=no")
'()) '())
;; MinGW: ncurses provides the termcap api. ;; MinGW: ncurses provides the termcap api.
,@(if (target-mingw?) #$@(if (target-mingw?)
'("bash_cv_termcap_lib=ncurses") '("bash_cv_termcap_lib=ncurses")
'())) '()))
,@(if (target-mingw?) #:make-flags
;; MinGW: termcap in ncurses (if (target-mingw?)
;; some SIG_* #defined in _POSIX ;; MinGW: termcap in ncurses
'(#:make-flags '("TERMCAP_LIB=-lncurses" ;; some SIG_* #defined in _POSIX
"CPPFLAGS=-D_POSIX -D'chown(f,o,g)=0'")) #~'("TERMCAP_LIB=-lncurses"
'()))) "CPPFLAGS=-D_POSIX -D'chown(f,o,g)=0'")
#~'())))
(synopsis "Edit command lines while typing, with history support") (synopsis "Edit command lines while typing, with history support")
(description (description
"The GNU readline library allows users to edit command lines as they "The GNU readline library allows users to edit command lines as they