04/04: gnu: recutils: Use correct bash headers.

[guix-commits]

lilyp pushed a commit to branch master
in repository guix.

commit e4087930f3ad60918689be5f4bca4ce3e22429f5
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Sat Jun 4 10:30:12 2022 +0200

    gnu: recutils: Use correct bash headers.
    
    * gnu/packages/databases.scm (recutils)[arguments]: Convert to 
G-Expressions.
    Drop gratuitous dirname.
    [native-inputs]: Drop labels.  Move bash:include...
    [inputs]: ... here.  Also add regular bash.
---
 gnu/packages/databases.scm | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 74483d27f7..9928ede40e 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1556,20 +1556,17 @@ organized in a hash table or B+ tree.")
     (build-system gnu-build-system)
     (arguments
      (list #:configure-flags
-           '(list "--disable-static"
-                  (string-append "--with-bash-headers="
-                                 (dirname (search-input-directory
-                                           %build-inputs
-                                           "include/bash"))))))
+           #~(list "--disable-static"
+                   (string-append "--with-bash-headers="
+                                  (search-input-directory %build-inputs
+                                                          "include/bash")))))
     (native-inputs
-     ;; XXX Without labels, the default 'configure phase picks the wrong 
"bash".
-     `(("bc" ,bc)
-       ("bash:include" ,bash "include")
-       ("check" ,check)
-       ("pkg-config" ,pkg-config)))
+     (list bc check-0.14 pkg-config))
     (inputs
      ;; TODO: Add more optional inputs.
-     (list curl
+     (list bash                         ; /bin/bash for native compilation
+           `(,bash "include")
+           curl
            libgcrypt
            `(,util-linux "lib")))
     (synopsis "Manipulate plain text files as databases")