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.
This commit is contained in:
parent
0195d4b1c3
commit
3790372979
@ -6587,38 +6587,38 @@ GVFS comes with a set of backends, including trash support, SFTP, SMB, HTTP,
|
|||||||
DAV, and others.")
|
DAV, and others.")
|
||||||
(license license:lgpl2.0+)))
|
(license license:lgpl2.0+)))
|
||||||
|
|
||||||
(define-public gusb
|
(define-public gusb-minimal
|
||||||
(package
|
(package
|
||||||
(name "gusb")
|
(name "gusb-minimal")
|
||||||
(version "0.3.5")
|
(version "0.3.5")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
(uri (git-reference
|
(uri (git-reference
|
||||||
(url "https://github.com/hughsie/libgusb")
|
(url "https://github.com/hughsie/libgusb")
|
||||||
(commit version)))
|
(commit version)))
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0ifhdqhpyxwsg0z9s1anj7cf5pya5qsqyp5ksh9n7mqwa4lrjkl8"))))
|
"0ifhdqhpyxwsg0z9s1anj7cf5pya5qsqyp5ksh9n7mqwa4lrjkl8"))))
|
||||||
(build-system meson-build-system)
|
(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
|
(native-inputs
|
||||||
`(("gobject-introspection" ,gobject-introspection)
|
`(("gobject-introspection" ,gobject-introspection)
|
||||||
("pkg-config" ,pkg-config)
|
("pkg-config" ,pkg-config)
|
||||||
("vala" ,vala)
|
("vala" ,vala)))
|
||||||
("gtk-doc" ,gtk-doc/stable)))
|
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
;; Both of these are required by gusb.pc.
|
;; Both of these are required by gusb.pc.
|
||||||
`(("glib" ,glib)
|
`(("glib" ,glib)
|
||||||
("libusb" ,libusb)))
|
("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")
|
(home-page "https://github.com/hughsie/libgusb")
|
||||||
(synopsis "GLib binding for libusb1")
|
(synopsis "GLib binding for libusb1")
|
||||||
(description
|
(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.")
|
USB transfers with your high-level application or system daemon.")
|
||||||
(license license:lgpl2.1+)))
|
(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
|
(define-public simple-scan
|
||||||
(package
|
(package
|
||||||
(name "simple-scan")
|
(name "simple-scan")
|
||||||
|
Loading…
Reference in New Issue
Block a user