[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
113/149: gnu: gusb-minimal: Introduce minimal variant.
From: |
guix-commits |
Subject: |
113/149: gnu: gusb-minimal: Introduce minimal variant. |
Date: |
Tue, 26 Oct 2021 23:52:35 -0400 (EDT) |
apteryx pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit b4cc384ab497a4f1ecc7cbc6e924ffeb726af2cf
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 1c4f6a4..b79cf48 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")
- 76/149: gnu: glibc: Look for the current timezone in /etc/localtime., (continued)
- 76/149: gnu: glibc: Look for the current timezone in /etc/localtime., guix-commits, 2021/10/26
- 71/149: gnu: dbus-c++: Fix build., guix-commits, 2021/10/26
- 91/149: gnu: rust: Bootstrap rust from 1.39.0 and optimize build time., guix-commits, 2021/10/26
- 93/149: gnu: Build all Rust packages using the latest rustc., guix-commits, 2021/10/26
- 95/149: gnu: Move a few Python packages to (gnu packages python-build)., guix-commits, 2021/10/26
- 97/149: gnu: Add python-flit-core., guix-commits, 2021/10/26
- 101/149: gnu: python-pathlib2: Update to 2.3.6., guix-commits, 2021/10/26
- 106/149: gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape., guix-commits, 2021/10/26
- 108/149: gnu: lsof: Fix indentation., guix-commits, 2021/10/26
- 110/149: gnu: Add docbook-xsl-ns., guix-commits, 2021/10/26
- 113/149: gnu: gusb-minimal: Introduce minimal variant.,
guix-commits <=
- 114/149: gnu: rest: Use libsoup-minimal., guix-commits, 2021/10/26
- 119/149: gnu: openssl: Absorb 1.1.1l graft., guix-commits, 2021/10/26
- 118/149: gnu: cmake-bootstrap: Update to 3.21.3., guix-commits, 2021/10/26
- 116/149: gnu: mesa: Update to 21.2.4., guix-commits, 2021/10/26
- 115/149: gnu: inkscape: Remove the legacy 0.92 version., guix-commits, 2021/10/26
- 124/149: gnu: libthai: Make datrie a normal native-input., guix-commits, 2021/10/26
- 125/149: gnu: glib: Update to 2.70, specify a bindir prefix and hide package., guix-commits, 2021/10/26
- 126/149: gnu: glib-networking: Update to 2.70.rc., guix-commits, 2021/10/26
- 127/149: gnu: vala: Update to 0.54.2., guix-commits, 2021/10/26
- 130/149: gnu: webkitgtk: Update to 2.34.0., guix-commits, 2021/10/26