110/130: gnu: gusb-minimal: Introduce minimal variant.

[guix-commits]

apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.

commit 7fbb368132ae780449e778a695c6e103ed0119bb
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.
    [configure-flags]: Disable docs, introspection and vapi.
    (gusb): Rewrite in terms of gusb-minimal, with the gobject-introspection and
    gtk-doc native inputs re-added.
---
 gnu/packages/gnome.scm | 49 +++++++++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c97d970..4cdb340 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5266,7 +5266,7 @@ keyboard shortcuts.")
        ("udev" ,eudev)))
     (inputs
      `(("dbus-glib" ,dbus-glib)
-       ("gusb" ,gusb)
+       ("gusb" ,gusb-minimal)
        ("libgudev" ,libgudev)
        ("libusb" ,libusb)
        ("polkit" ,polkit)
@@ -6559,38 +6559,33 @@ 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)
+    (arguments
+     `(#:tests? #f          ;libusb fails to initialize.  Wonder what that is.
+       #:configure-flags
+       (list "-Ddocs=false"
+             "-Dintrospection=false"
+             "-Dvapi=false")))
     (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.
-       #:configure-flags
-       ,(if (%current-target-system)
-            ;; Introspection data cannot currently be cross-compiled.
-            ''("-Dintrospection=false"
-               ;; Requires introspection data.
-               "-Dvapi=false")
-            ''())))
     (home-page "https://github.com/hughsie/libgusb";)
     (synopsis "GLib binding for libusb1")
     (description
@@ -6600,6 +6595,24 @@ 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")
+    (arguments
+     (substitute-keyword-arguments (package-arguments gusb-minimal)
+       ((#:configure-flags _)
+        `(if ,(%current-target-system)
+             ;; Introspection data cannot currently be cross-compiled.
+             '("-Dintrospection=false"
+               ;; Requires introspection data.
+               "-Dvapi=false")
+             '()))))
+    (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")