* gnu/packages/databases.scm (ephemeralpg): Fix cross-compilation. [arguments]: Use Gexp, remove tailed #t. [inputs]: Add bash-minimal. Change-Id: Icdb3dc2db120b07f0d4f03a94a693459974ae06f --- gnu/packages/databases.scm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index f0ea100c3b..c5e493440e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -62,6 +62,7 @@ ;;; Copyright © 2023 Felix Gruber ;;; Copyright © 2023 Giacomo Leidi +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -202,26 +203,25 @@ (define-public ephemeralpg (base32 "1ap22ki8yz6agd0qybcjgs4b9izw1rwwcgpxn3jah2ccfyax34s6")))) (build-system gnu-build-system) (arguments - `(#:make-flags (list (string-append "CC=" ,(cc-for-target)) - (string-append "PREFIX=" %output)) - #:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure script - (add-after 'install 'wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/pg_tmp") - `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "util-linux") - "/bin") - ,(string-append (assoc-ref inputs "postgresql") - "/bin") - ;; For getsocket. - ,(string-append out "/bin"))))) - #t))) - #:test-target "test")) + (list #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ; no configure script + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/pg_tmp") + `("PATH" ":" prefix + (,(string-append (assoc-ref inputs "util-linux") + "/bin") + ,(string-append (assoc-ref inputs "postgresql") + "/bin") + ;; For getsocket. + ,(string-append out "/bin")))))))) + #:test-target "test")) (inputs - (list postgresql util-linux)) + (list bash-minimal postgresql util-linux)) (native-inputs ;; For tests. (list ruby which)) base-commit: d20ece07dbb09382f361c8bbf0bcab9e83d8b73e -- 2.41.0