[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/13: gnu: authenticator: Patch to build with a recent meson.
From: |
guix-commits |
Subject: |
07/13: gnu: authenticator: Patch to build with a recent meson. |
Date: |
Sun, 9 Apr 2023 12:57:15 -0400 (EDT) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit 86fcb344b959fed7a5d592709e8625bb816a86ad
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Apr 9 11:30:59 2023 -0400
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.
---
gnu/packages/gnome.scm | 37 ++++++++++++++++++++-----------------
1 file 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
- branch core-updates updated (03580b5f1d -> 2bde53c594), guix-commits, 2023/04/09
- 05/13: gnu: dconf-editor: Update to 43.0., guix-commits, 2023/04/09
- 04/13: gnu: gnome-screenshot: Update to 41.0-0.9f067cf., guix-commits, 2023/04/09
- 07/13: gnu: authenticator: Patch to build with a recent meson.,
guix-commits <=
- 11/13: build: meson: Explicitly invoke "meson setup" instead of just "meson"., guix-commits, 2023/04/09
- 01/13: gnu: Remove extraneous #:meson build arguments., guix-commits, 2023/04/09
- 08/13: gnu: gnome-mahjongg: Update to 3.38.3-0.e9e73e5., guix-commits, 2023/04/09
- 10/13: build: meson: Honor bindir, libdir and includedir., guix-commits, 2023/04/09
- 03/13: gnu: libnice: Update to 0.1.21., guix-commits, 2023/04/09
- 02/13: gnu: gnome-user-share: Update to 43.0., guix-commits, 2023/04/09
- 09/13: gnu: libcacard: Use latest meson., guix-commits, 2023/04/09
- 06/13: gnu: gnome-disk-utility: Update to 44.0., guix-commits, 2023/04/09
- 12/13: gnu: meson: Update to 1.0.1., guix-commits, 2023/04/09
- 13/13: gnu: gtk: Do not manually move /bin., guix-commits, 2023/04/09