guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit 22adad61a4499ec93148cdac42469def9c6aea0b Author: Zheng Junjie <[email protected]> AuthorDate: Tue Oct 27 01:27:32 2026 +0800 gnu: apr: Use G-exp. * gnu/packages/apr.scm (apr)[arguments]: Use G-exp. --- gnu/packages/apr.scm | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/gnu/packages/apr.scm b/gnu/packages/apr.scm index 03d68da3ef7..ead984f3871 100644 --- a/gnu/packages/apr.scm +++ b/gnu/packages/apr.scm @@ -50,27 +50,27 @@ ;; Sometimes we end up with two processes concurrently trying to make ;; 'libmod_test.la': <http://hydra.gnu.org/build/60266/nixlog/2/raw>. ;; Thus, build sequentially. - `(#:parallel-build? #f - #:parallel-tests? #f - #:disallowed-references () - #:phases - (modify-phases %standard-phases - ,@(if (target-ppc32?) - `((add-after 'unpack 'patch-sources - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (invoke "patch" "-p1" "--force" "--input" - (assoc-ref (or native-inputs inputs) - "atomics-patch"))))) - '()) - (add-after 'install 'patch-libxcrypt-reference - (lambda* (#:key inputs outputs #:allow-other-keys) - (define out (assoc-ref outputs "out")) - (define libxcrypt - (dirname (search-input-file inputs "/lib/libcrypt.so.1"))) - (substitute* (list (string-append out "/bin/apr-1-config") - (string-append out "/lib/pkgconfig/apr-1.pc")) - (("-lcrypt") - (string-append "-L" libxcrypt " -lcrypt")))))))) + (list #:parallel-build? #f + #:parallel-tests? #f + #:disallowed-references '() + #:phases + #~(modify-phases %standard-phases + #$@(if (target-ppc32?) + #~((add-after 'unpack 'patch-sources + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (invoke "patch" "-p1" "--force" "--input" + (assoc-ref (or native-inputs inputs) + "atomics-patch"))))) + #~()) + (add-after 'install 'patch-libxcrypt-reference + (lambda* (#:key inputs outputs #:allow-other-keys) + (define out (assoc-ref outputs "out")) + (define libxcrypt + (dirname (search-input-file inputs "/lib/libcrypt.so.1"))) + (substitute* (list (string-append out "/bin/apr-1-config") + (string-append out "/lib/pkgconfig/apr-1.pc")) + (("-lcrypt") + (string-append "-L" libxcrypt " -lcrypt")))))))) (inputs (list perl libltdl libxcrypt)) (native-inputs `(,@(if (target-ppc32?)
