From: John Kehayias via Guix-patches via <guix-patches@gnu.org>
To: 53418@debbugs.gnu.org
Subject: [bug#53418] [PATCH] gnu: piper: Fix build.
Date: Fri, 21 Jan 2022 18:17:57 +0000 [thread overview]
Message-ID: <FxvM2_cQc3tj3fX9k59Bo8WQL2VV3aUiRzP34Yt44c6d1VcvE2sENtUYDB48LMb1KonKiCADpVS5VwoHNua2pqEpcLS-dcRx9I5RT3yEz5Q=@protonmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 720 bytes --]
Hello,
This is a followup to https://issues.guix.gnu.org/53372 fixing Piper (which uses libratbag). Python was added to the inputs to fix the build since Meson does not propagate Python (added to inputs rather than native-inputs as guix gc shows a reference to Python).
That allows Piper to build but it had a librsvg error on startup, like syncthing-gtk in https://issues.guix.gnu.org/52651 Fixed the same way here by removing librsvg from inputs since it is propagated by gtk+.
(Also simplified the input labels while I was at it, but my quick attempt at rewriting the phases with gexps didn't get far. Since I didn't find any similar examples in current packages, I left it as is for now.)
Thanks!
John
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-piper-Fix-build.patch --]
[-- Type: text/x-patch; name=0001-gnu-piper-Fix-build.patch, Size: 3435 bytes --]
From 5ae7945017dc4d664bdc6ddbffaea6422db72402 Mon Sep 17 00:00:00 2001
From: John Kehayias <john.kehayias@protonmail.com>
Date: Fri, 21 Jan 2022 13:05:15 -0500
Subject: [PATCH] gnu: piper: Fix build.
Since commit 6f36d0c89e3bf19bb7bb8f7f5b77de30c9af861b, Meson no longer
propagates Python. GTK+ propagates librsvg-bootstrap which causes a startup
error due to two librsvg being GI_TYPELIB_PATH.
* gnu/packages/gnome.scm (piper)[inputs]: Add PYTHON. Remove LIBRSVG. Simplify.
[native-inputs]: Simplify.
[arguments]: Remove trailing #t from phases.
---
gnu/packages/gnome.scm | 35 +++++++++++++++++------------------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 088c368054..565e3987b7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -67,6 +67,7 @@
;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
;;; Copyright © 2022 Pierre Langlois <pierre.langlois@gmx.com>
+;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -12101,21 +12102,21 @@ (define-public piper
(file-name (git-file-name name version))))
(build-system meson-build-system)
(native-inputs
- `(("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin")
- ("gobject-introspection" ,gobject-introspection)
- ("pkg-config" ,pkg-config)
- ("python-flake8" ,python-flake8)))
+ (list gettext-minimal
+ `(,glib "bin")
+ gobject-introspection
+ pkg-config
+ python-flake8))
(inputs
- `(("adwaita-icon-theme" ,adwaita-icon-theme)
- ("gtk" ,gtk+)
- ("gtk:bin" ,gtk+ "bin")
- ("libratbag" ,libratbag)
- ("librsvg" ,librsvg)
- ("python-evdev" ,python-evdev)
- ("python-lxml" ,python-lxml)
- ("python-pycairo" ,python-pycairo)
- ("python-pygobject" ,python-pygobject)))
+ (list adwaita-icon-theme
+ gtk+
+ `(,gtk+ "bin")
+ libratbag
+ python
+ python-evdev
+ python-lxml
+ python-pycairo
+ python-pygobject))
(arguments
`(#:imported-modules ((guix build python-build-system)
,@%meson-build-system-modules)
@@ -12128,8 +12129,7 @@ (define-public piper
(add-after 'unpack 'dont-update-gtk-icon-cache
(lambda _
(substitute* "meson.build"
- (("meson.add_install_script('meson_install.sh')") ""))
- #t))
+ (("meson.add_install_script('meson_install.sh')") ""))))
;; TODO: Switch to wrap-script when it is fixed.
(add-after 'install 'wrap-python
(assoc-ref python:%standard-phases 'wrap))
@@ -12137,8 +12137,7 @@ (define-public piper
(lambda* (#:key outputs #:allow-other-keys)
(wrap-program
(string-append (assoc-ref outputs "out" )"/bin/piper")
- `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
- #t)))))
+ `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))
(home-page "https://github.com/libratbag/piper/")
(synopsis "Configure bindings and LEDs on gaming mice")
(description "Piper is a GTK+ application for configuring gaming mice with
--
2.34.0
next reply other threads:[~2022-01-21 18:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-21 18:17 John Kehayias via Guix-patches via [this message]
2022-01-21 18:26 ` [bug#53418] [PATCH] gnu: piper: Fix build Leo Famulari
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='FxvM2_cQc3tj3fX9k59Bo8WQL2VV3aUiRzP34Yt44c6d1VcvE2sENtUYDB48LMb1KonKiCADpVS5VwoHNua2pqEpcLS-dcRx9I5RT3yEz5Q=@protonmail.com' \
--to=guix-patches@gnu.org \
--cc=53418@debbugs.gnu.org \
--cc=john.kehayias@protonmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.