From 934ee411fb009f93cefbe2f750fab52ae86ba301 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Mon, 15 Sep 2025 13:22:35 +0200 Subject: [PATCH] gnu: helvum: Improve style. * gnu/packages/rust-apps.scm (helvum)[arguments]: Improve style, use G-expressions. Change-Id: I9ad3173bc289ee8df6234c48a564599e66160c27 Signed-off-by: Sharlatan Hellseher --- gnu/packages/rust-apps.scm | 53 +++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 31f6eeb6c140b9beafb003b68392d63c65cd12fd..34e7e79355b686a1e639dc7f038e64b58aa71837 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1356,35 +1356,36 @@ repositories.") (base32 "1q8gkx7djrfdl8fykppsqkxiadsq47v0xhj612nxlrvjz8n77ygn")))) (build-system meson-build-system) (arguments - `(#:imported-modules (,@%meson-build-system-modules + (list + #:imported-modules `(,@%meson-build-system-modules ,@%cargo-build-system-modules) - #:modules (((guix build cargo-build-system) #:prefix cargo:) + #:modules '(((guix build cargo-build-system) #:prefix cargo:) (guix build meson-build-system) (guix build utils)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'prepare-for-build - (lambda _ - (substitute* "meson.build" - (("gtk_update_icon_cache: true") - "gtk_update_icon_cache: false") - (("update_desktop_database: true") - "update_desktop_database: false")) - (delete-file "Cargo.lock"))) - ;; The meson 'configure phase changes to a different directory and - ;; we need it created before unpacking the crates. - (add-after 'configure 'prepare-cargo-build-system - (lambda args - (for-each - (lambda (phase) - (format #t "Running cargo phase: ~a~%" phase) - (apply (assoc-ref cargo:%standard-phases phase) - #:vendor-dir "vendor" - args)) - '(unpack-rust-crates - configure - check-for-pregenerated-files - patch-cargo-checksums))))))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'prepare-for-build + (lambda _ + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false") + (("update_desktop_database: true") + "update_desktop_database: false")) + (delete-file "Cargo.lock"))) + ;; The meson 'configure phase changes to a different directory and + ;; we need it created before unpacking the crates. + (add-after 'configure 'prepare-cargo-build-system + (lambda args + (for-each + (lambda (phase) + (format #t "Running cargo phase: ~a~%" phase) + (apply (assoc-ref cargo:%standard-phases phase) + #:vendor-dir "vendor" + args)) + '(unpack-rust-crates + configure + check-for-pregenerated-files + patch-cargo-checksums))))))) (native-inputs (list clang pkg-config rust `(,rust "cargo"))) (inputs (cons* glib gtk libadwaita pipewire (cargo-inputs 'helvum))) (home-page "https://gitlab.freedesktop.org/pipewire/helvum")