From dfa312a95e7db01f56e7fbc50173cf5ad446d0c1 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 30 Sep 2025 11:01:35 +0100 Subject: [PATCH] gnu: siril: Fix build with meson@1.9.0. This is to do with the wrap-mode for meson changing on mesa-updates. See: * gnu/packages/astronomy.scm (siril)[source] : Remove bundled libraries explicitly. [arguments] : Add "--wrap-mode=nodownload" option to fix build with recent Meson. [inputs]: Add healpix-cxx. Change-Id: I6b3afcb95ffc10b42453794fc3dafad03d049d01 --- gnu/packages/astronomy.scm | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index ff891311ec8be851cce7f39ee7747fb9d5dee56c..6973b0e41710d642060a510b70efc29243d89897 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -9905,11 +9905,30 @@ It can be used to calculate the trajectory of satellites.") (commit version))) (sha256 (base32 "1frvi6879zh4bzm5smdy0scpjmj5pg2i81wb2wa4ikq1dq227x8k")) - (file-name (git-file-name name version)))) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Remove bundled libraries. + (for-each delete-file-recursively + (list "subprojects/healpix_cxx" + ;; TODO: Package htmesh, it's included in KSarts + ;; - URL: + ;; - File: + ;; "subprojects/htmesh" + ;; + ;; TODO: Package kplot - Cairo plotting library + ;; . + ;; "subprojects/kplot" + "subprojects/wcslib" + "subprojects/librtprocess" + "subprojects/yyjson")))))) (build-system meson-build-system) (arguments (list #:glib-or-gtk? #t + #:configure-flags + #~(list "--wrap-mode=nodownload") #:imported-modules `(,@%meson-build-system-modules (guix build glib-or-gtk-build-system)) #:modules '((guix build meson-build-system) @@ -9943,9 +9962,10 @@ It can be used to calculate the trajectory of satellites.") ffms2 fftwf gdk-pixbuf - gtksourceview-4 gsl gtk+ + gtksourceview-4 + healpix-cxx json-glib lcms-next