[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
113/140: gnu: gusb-minimal: Introduce minimal variant.
From: |
guix-commits |
Subject: |
113/140: gnu: gusb-minimal: Introduce minimal variant. |
Date: |
Sun, 17 Oct 2021 23:11:10 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 4b116feded137628681014181d530f46fbb56a27
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.
[configure-flags]: Disable docs.
[native-inputs]: Remove gtk-doc.
(gusb): Rewrite in terms of gusb-minimal.
[configure-flags]: Enable docs.
[native-inputs]: Add gtk-doc.
---
gnu/packages/gnome.scm | 42 +++++++++++++++++++++++++++---------------
1 file changed, 27 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c8eb047..47fa2d0 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6579,38 +6579,38 @@ 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
+ (cons "-Ddocs=false"
+ (if ,(%current-target-system)
+ ;; Introspection data cannot currently be cross-compiled.
+ '("-Dintrospection=false"
+ ;; Requires introspection data.
+ "-Dvapi=false")
+ '()))))
(native-inputs
`(("gobject-introspection" ,gobject-introspection)
("pkg-config" ,pkg-config)
- ("vala" ,vala)
- ("gtk-doc" ,gtk-doc/stable)))
+ ("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
@@ -6620,6 +6620,18 @@ 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 flags)
+ `(cons "-Ddocs=true"
+ (delete "-Ddocs=false" ,flags)))))
+ (native-inputs
+ (cons `("gtk-doc" ,gtk-doc/stable)
+ (package-native-inputs gusb-minimal)))))
+
(define-public simple-scan
(package
(name "simple-scan")
- 12/140: gnu: appstream-glib: Propagate gdk-pixbuf+svg rather than gdk-pixbuf., (continued)
- 12/140: gnu: appstream-glib: Propagate gdk-pixbuf+svg rather than gdk-pixbuf., guix-commits, 2021/10/17
- 22/140: gnu: gst-plugins-good: Update to 1.18.4., guix-commits, 2021/10/17
- 25/140: gnu: gst-plugins-bad: Update to 1.18.4., guix-commits, 2021/10/17
- 31/140: gnu: libevdev: Update to 1.11.0., guix-commits, 2021/10/17
- 27/140: gnu: gst-editing-services: Update to 1.18.4., guix-commits, 2021/10/17
- 26/140: gnu: gst-plugins-bad: Add missing inputs to enable more features., guix-commits, 2021/10/17
- 33/140: gnu: bluez: Update to 5.59., guix-commits, 2021/10/17
- 118/140: gnu: cmake-bootstrap: Update to 3.21.3., guix-commits, 2021/10/17
- 119/140: gnu: openssl: Absorb 1.1.1l graft., guix-commits, 2021/10/17
- 135/140: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper., guix-commits, 2021/10/17
- 113/140: gnu: gusb-minimal: Introduce minimal variant.,
guix-commits <=
- 121/140: gnu: util-linux: Globally disable the lsns test., guix-commits, 2021/10/17
- 52/140: Revert commits made to resolve a gdk-pixbuf+svg propagation issue., guix-commits, 2021/10/17
- 34/140: gnu: gnupg: Don't explicitly return #t from phases., guix-commits, 2021/10/17
- 66/140: gnu: gst-editing-services: Update to 1.18.5., guix-commits, 2021/10/17
- 39/140: gnu: gstreamer-docs: Update to 1.19.2., guix-commits, 2021/10/17
- 57/140: gnu: Add a missing copyright., guix-commits, 2021/10/17
- 49/140: gnu: e2fsprogs: Update to 1.46.4., guix-commits, 2021/10/17
- 61/140: gnu: gst-plugins-base: Update to 1.18.5., guix-commits, 2021/10/17
- 40/140: gnu: gstreamer: Update to 1.19.2., guix-commits, 2021/10/17
- 53/140: gnu: googletest: Update to 1.11.0., guix-commits, 2021/10/17