[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/05: gnu: gusb-minimal: Introduce minimal variant.
From: |
guix-commits |
Subject: |
04/05: gnu: gusb-minimal: Introduce minimal variant. |
Date: |
Fri, 15 Oct 2021 17:01:51 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 4b14d4ab5d4c38f1937fd07cfe2e9370002832e7
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Oct 15 16:46:03 2021 -0400
gnu: gusb-minimal: Introduce minimal variant.
This is needed to prevent a dependency cycle between Inkscape and GTK+.
* gnu/packages/gnome.scm (gusb-minimal): New variable without
gobject-introspection and gtk-doc native inputs.
(gusb): Rewrite in terms of gusb-minimal, with the gobject-introspection and
gtk-doc native inputs re-added.
---
gnu/packages/gnome.scm | 27 +++++++++++++++++----------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 4515e17..c377a78 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5272,7 +5272,7 @@ keyboard shortcuts.")
("udev" ,eudev)))
(inputs
`(("dbus-glib" ,dbus-glib)
- ("gusb" ,gusb)
+ ("gusb" ,gusb-minimal)
("libgudev" ,libgudev)
("libusb" ,libusb)
("polkit" ,polkit)
@@ -6565,31 +6565,29 @@ GVFS comes with a set of backends, including trash
support, SFTP, SMB, HTTP,
DAV, and others.")
(license license:lgpl2.0+)))
-(define-public gusb
+(define-public gusb-minimal
(package
- (name "gusb")
+ (name "gusb-minimal")
(version "0.3.5")
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/hughsie/libgusb")
- (commit version)))
+ (url "https://github.com/hughsie/libgusb")
+ (commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0ifhdqhpyxwsg0z9s1anj7cf5pya5qsqyp5ksh9n7mqwa4lrjkl8"))))
(build-system meson-build-system)
(native-inputs
- `(("gobject-introspection" ,gobject-introspection)
- ("pkg-config" ,pkg-config)
- ("vala" ,vala)
- ("gtk-doc" ,gtk-doc/stable)))
+ `(("pkg-config" ,pkg-config)
+ ("vala" ,vala)))
(propagated-inputs
;; Both of these are required by gusb.pc.
`(("glib" ,glib)
("libusb" ,libusb)))
(arguments
- `(#:tests? #f ;libusb fails to initialize. Wonder what that is.
+ `(#:tests? #f ;libusb fails to initialize. Wonder what that is.
#:configure-flags
,(if (%current-target-system)
;; Introspection data cannot currently be cross-compiled.
@@ -6606,6 +6604,15 @@ and integration into a mainloop. This makes it easy to
integrate low level
USB transfers with your high-level application or system daemon.")
(license license:lgpl2.1+)))
+(define-public gusb
+ (package/inherit gusb-minimal
+ (name "gusb")
+ (native-inputs
+ (append
+ `(("gobject-introspection" ,gobject-introspection)
+ ("gtk-doc" ,gtk-doc/stable))
+ (package-native-inputs gusb-minimal)))))
+
(define-public simple-scan
(package
(name "simple-scan")