From 21bf76c5639952ca6ee8de171739e9521a74f924 Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Tue, 18 Jun 2024 13:26:16 +0200 Subject: [PATCH] gnu: mingw-w64-tools: Use G-Expressions. * gnu/packages/mingw.scm (mingw-w64-tools): Use G-Expressions. Change-Id: I690d0aeae6c6920d2e3eb43732d6b421a3dfc59b Signed-off-by: Christopher Baines --- gnu/packages/mingw.scm | 74 +++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm index 8a8a885446..c0a258091c 100644 --- a/gnu/packages/mingw.scm +++ b/gnu/packages/mingw.scm @@ -162,45 +162,45 @@ several new APIs such as DirectX and DDK, and 64-bit support.") (base32 "047f4m37kxf7g8qj23qplrzfd9cirfkkv8d175sfv2zfd7hbqriz")))) (build-system gnu-build-system) (arguments - `(#:modules ((guix build gnu-build-system) + (list + #:modules '((guix build gnu-build-system) (guix build utils) (srfi srfi-1)) - #:phases - (append - (modify-phases %standard-phases - (add-after 'unpack 'cd-gendef - (lambda _ - (chdir "mingw-w64-tools/gendef")))) - (modify-phases %standard-phases - (replace 'unpack - (lambda _ - (chdir "../genidl")))) - (modify-phases %standard-phases - (replace 'unpack - (lambda _ - (chdir "../genlib")))) - (modify-phases %standard-phases - (replace 'unpack - (lambda _ - (chdir "../genpeimg")))) - (append-map - (lambda (target) - (modify-phases %standard-phases - (replace 'unpack - (lambda _ - (chdir "../widl") - (false-if-exception - (delete-file-recursively "../build")) - #t)) - (replace 'configure - (lambda args - (apply (assoc-ref %standard-phases 'configure) - (append args (list #:out-of-source? #t - #:configure-flags - `("--target" ,target - "--program-prefix" - ,(string-append target "-"))))))))) - '("i686-w64-mingw32" "x86_64-w64-mingw32"))))) + #:phases + #~(append + (modify-phases %standard-phases + (add-after 'unpack 'cd-gendef + (lambda _ + (chdir "mingw-w64-tools/gendef")))) + (modify-phases %standard-phases + (replace 'unpack + (lambda _ + (chdir "../genidl")))) + (modify-phases %standard-phases + (replace 'unpack + (lambda _ + (chdir "../genlib")))) + (modify-phases %standard-phases + (replace 'unpack + (lambda _ + (chdir "../genpeimg")))) + (append-map + (lambda (target) + (modify-phases %standard-phases + (replace 'unpack + (lambda _ + (chdir "../widl") + (false-if-exception + (delete-file-recursively "../build")))) + (replace 'configure + (lambda args + (apply (assoc-ref %standard-phases 'configure) + (append args (list #:out-of-source? #t + #:configure-flags + `("--target" ,target + "--program-prefix" + ,(string-append target "-"))))))))) + '("i686-w64-mingw32" "x86_64-w64-mingw32"))))) (home-page "https://mingw-w64.org") (synopsis "Tools of Minimalist GNU for Windows") (description "This package provides the tools of Minimalist GNU for