summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Graves <ngraves@ngraves.fr>2025-09-15 13:22:35 +0200
committerAndreas Enge <andreas@enge.fr>2025-10-17 12:04:48 +0200
commit150a890c6b8fe8d75184be4fe10503436243939f (patch)
tree91d6b4b4609c3392901b6fcb148ecf9637e02826
parent9e6c254e4510ce35c132a5dba1d1d1460192300d (diff)
gnu: helvum: Improve style.
* gnu/packages/rust-apps.scm (helvum)[arguments]: Improve style, use G-expressions. Change-Id: I9ad3173bc289ee8df6234c48a564599e66160c27 Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
-rw-r--r--gnu/packages/rust-apps.scm53
1 files changed, 27 insertions, 26 deletions
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm
index 20486353f7..fcd5841868 100644
--- a/gnu/packages/rust-apps.scm
+++ b/gnu/packages/rust-apps.scm
@@ -1294,35 +1294,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")