diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-09 11:30:59 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-09 12:55:45 -0400 |
| commit | 86fcb344b959fed7a5d592709e8625bb816a86ad (patch) | |
| tree | 07c3f0233205bdbece8bf32676a3f2f62fffdfba | |
| parent | 2f79fd92f4e0459e3596a8ab34ded9c230d15de1 (diff) | |
| download | guix-86fcb344b959fed7a5d592709e8625bb816a86ad.tar guix-86fcb344b959fed7a5d592709e8625bb816a86ad.tar.gz | |
gnu: authenticator: Patch to build with a recent meson.
* gnu/packages/gnome.scm (authenticator)
[arguments]: Use gexps. Remove #:meson argument. Add 'patch-meson.build
phase. Use search-input-file in python-and-gi-wrap phase.
| -rw-r--r-- | gnu/packages/gnome.scm | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f6a4c3da15..07a27d4272 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10249,23 +10249,26 @@ specified duration and save it as a GIF encoded animated image file.") (base32 "1c4r9rnrz5gazrfg0z2rcwax4nscs7z391bcjcl74k6ln3blwzpr")))) (build-system meson-build-system) (arguments - `(#:meson ,meson-0.59 - #:glib-or-gtk? #t - #:phases - (modify-phases %standard-phases - (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((prog (string-append (assoc-ref outputs "out") - "/bin/authenticator")) - (pylib (string-append (assoc-ref outputs "out") - "/lib/python" - ,(version-major+minor - (package-version - (this-package-input "python"))) - "/site-packages"))) - (wrap-program prog - `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib)) - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))) + (list + #:glib-or-gtk? #t + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-meson.build + (lambda _ + (substitute* "data/meson.build" + (("^ 'desktop',.*") "") + (("^ 'appdata',.*") "")))) + (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((prog (search-input-file outputs "bin/authenticator")) + (pylib (string-append #$output "/lib/python" + #$(version-major+minor + (package-version + (this-package-input "python"))) + "/site-packages"))) + (wrap-program prog + `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib)) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))) (native-inputs (list desktop-file-utils gettext-minimal |