summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-06-28 00:41:42 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-06-28 00:48:19 -0400
commit8d810c209f18ffb635a1db2488a939543c6f060f (patch)
treef7fe5d583b5e2b23574c3e8f7d944335cb708c8b
parent.dir-locals.el: Properly indent 'wrap-script'. (diff)
downloadguix-8d810c209f18ffb635a1db2488a939543c6f060f.tar.gz
guix-8d810c209f18ffb635a1db2488a939543c6f060f.tar.bz2
guix-8d810c209f18ffb635a1db2488a939543c6f060f.tar.xz
h-client: Do not fail in pure environments.
Fixes <https://issues.guix.gnu.org/56223>. * gnu/packages/hardware.scm (h-client)[imported-modules]: New argument. [modules]: Likewise. [phases]{generate-gdk-pixbuf-loaders-cache-file} {glib-or-gtk-compile-schemas, glib-or-gtk-wrap}: Add glib-or-gtk phases. {wrap-more}: Wrap GI_TYPELIB_PATH and PATH. [inputs]: Add gobject-introspection and guile-3.0. Reported-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r--gnu/packages/hardware.scm29
1 files changed, 29 insertions, 0 deletions
diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index acc3fb3059..ecff498156 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -84,6 +84,7 @@
84 #:use-module (gnu packages xml) 84 #:use-module (gnu packages xml)
85 #:use-module (gnu packages xorg) 85 #:use-module (gnu packages xorg)
86 #:use-module (guix build-system cmake) 86 #:use-module (guix build-system cmake)
87 #:use-module (guix build-system glib-or-gtk)
87 #:use-module (guix build-system gnu) 88 #:use-module (guix build-system gnu)
88 #:use-module (guix build-system meson) 89 #:use-module (guix build-system meson)
89 #:use-module (guix build-system perl) 90 #:use-module (guix build-system perl)
@@ -598,8 +599,36 @@ human-readable format and checks if it conforms to the standards.")
598 (sha256 599 (sha256
599 (base32 "0hm86d51kj5r3yxq4c23aa57cs8igz3wrkbjn20z4frx75rpf46m")))) 600 (base32 "0hm86d51kj5r3yxq4c23aa57cs8igz3wrkbjn20z4frx75rpf46m"))))
600 (build-system python-build-system) 601 (build-system python-build-system)
602 (arguments
603 (list
604 #:imported-modules `(,@%python-build-system-modules
605 ,@%glib-or-gtk-build-system-modules)
606 #:modules '(((guix build glib-or-gtk-build-system) #:prefix glib:)
607 (guix build python-build-system)
608 (guix build utils))
609 #:phases
610 #~(modify-phases %standard-phases
611 (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
612 (assoc-ref glib:%standard-phases
613 'generate-gdk-pixbuf-loaders-cache-file))
614 (add-after 'install 'glib-or-gtk-compile-schemas
615 (assoc-ref glib:%standard-phases 'glib-or-gtk-compile-schemas))
616 (add-after 'install 'glib-or-gtk-wrap
617 (assoc-ref glib:%standard-phases 'glib-or-gtk-wrap))
618 (add-after 'glib-or-gtk-wrap 'wrap-more
619 (lambda* (#:key inputs outputs #:allow-other-keys)
620 (wrap-script (search-input-file outputs "bin/h-client")
621 ;; Wrap GI_TYPELIB_PATH to avoid the error "ValueError:
622 ;; Namespace GdkPixbuf not available".
623 `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))
624 `("PATH" = (,(dirname (search-input-file
625 inputs "sbin/lspci"))
626 ,(dirname (search-input-file
627 inputs "bin/lsusb"))))))))))
601 (inputs 628 (inputs
602 (list gdk-pixbuf 629 (list gdk-pixbuf
630 gobject-introspection ;for GI_TYPELIB_PATH
631 guile-3.0
603 gtk+ 632 gtk+
604 pciutils 633 pciutils
605 python-pycurl 634 python-pycurl