From 1c3fe0e491a09e62f487b550b8f6d4fa26e888bd Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Sun, 26 Jun 2022 15:06:14 +0200
Subject: gnu: readline: Remove input labels.

* gnu/packages/readline.scm (readline)[arguments]: Convert to G-expression.
Don't look up inputs by label.
---
 gnu/packages/readline.scm | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

(limited to 'gnu/packages/readline.scm')

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