[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
113/169: gnu: gusb-minimal: Introduce minimal variant.
From: |
guix-commits |
Subject: |
113/169: gnu: gusb-minimal: Introduce minimal variant. |
Date: |
Thu, 28 Oct 2021 02:08:51 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit a67ffefc8eb03fbf6ee98042e16b6e3cf7b401e3
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 7775d06..c3e6a25 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6587,38 +6587,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
@@ -6628,6 +6628,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")
- 127/169: gnu: vala: Update to 0.54.2., (continued)
- 127/169: gnu: vala: Update to 0.54.2., guix-commits, 2021/10/28
- 129/169: gnu: libsoup: Update to 3.0.1., guix-commits, 2021/10/28
- 130/169: gnu: webkitgtk: Update to 2.34.1., guix-commits, 2021/10/28
- 131/169: gnu: pulseaudio: Add doxygen to fix build., guix-commits, 2021/10/28
- 134/169: gnu: llvm: Add make-lld-wrapper, lld-wrapper and lld-as-ld-wrapper., guix-commits, 2021/10/28
- 135/169: gnu: ungoogled-chromium: Use the new lld-as-ld-wrapper., guix-commits, 2021/10/28
- 136/169: gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase., guix-commits, 2021/10/28
- 137/169: build: glib-or-gtk: Generate the gdk-pixbuf-loaders cache file in a phase., guix-commits, 2021/10/28
- 139/169: gnu: gdk-pixbuf: Add a search path for the loaders cache file., guix-commits, 2021/10/28
- 142/169: gnu: gawk: Use regular bash to cope with test suite failures., guix-commits, 2021/10/28
- 113/169: gnu: gusb-minimal: Introduce minimal variant.,
guix-commits <=
- 146/169: gnu: nspr: Normalize inputs., guix-commits, 2021/10/28
- 138/169: profiles: Add a gdk-pixbuf-loaders-cache-file hook., guix-commits, 2021/10/28
- 143/169: gnu: elogind: Update to 246.10., guix-commits, 2021/10/28
- 153/169: gnu: python-dbus: Update to 1.2.18., guix-commits, 2021/10/28
- 158/169: gnu: python-dateutil: Update to 2.8.2., guix-commits, 2021/10/28
- 161/169: gnu: mesa: Replace obsolete vulkan-overlay-layer build option., guix-commits, 2021/10/28
- 159/169: gnu: gdk-pixbuf: Remove obsolete jasper support., guix-commits, 2021/10/28
- 132/169: gnu: webkitgtk: Add a debug output., guix-commits, 2021/10/28
- 145/169: gnu: mariadb: Only run the main test suite to avoid flaky tests., guix-commits, 2021/10/28
- 156/169: gnu: python-pytest: Update to 6.2.5., guix-commits, 2021/10/28