diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-08-10 15:32:51 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-08-10 15:32:51 +0200 |
| commit | 7b38f045c04fe69001ff5c2f04486cc51a69ae82 (patch) | |
| tree | bd839f1f635dc114c84d67c1db09b74f613ec315 /gnu/packages/gnome.scm | |
| parent | 369d15674c8bb251c45a45466031a2da1640df9f (diff) | |
| parent | 256d5c6e339d59287284bb83f35c594f13bd08f9 (diff) | |
| download | guix-7b38f045c04fe69001ff5c2f04486cc51a69ae82.tar guix-7b38f045c04fe69001ff5c2f04486cc51a69ae82.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/gnome.scm')
| -rw-r--r-- | gnu/packages/gnome.scm | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6fcd3ceb9c..311083395a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4002,39 +4002,26 @@ DAV, and others.") (define-public gusb (package (name "gusb") - (version "0.2.9") + (version "0.3.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/hughsie/libgusb/archive/" - "gusb_" - (string-join (string-split version #\.) - "_") - ".tar.gz")) + version ".tar.gz")) (sha256 (base32 - "1500mgpidmnjfkcz1fzqkbqv547iy1cvr8bwf3k9vqgqcjx3844n")))) - (build-system gnu-build-system) + "1wa9787ww7s1kl9jml6kiyrjgimlgagq4jmgdj7xcpsx83w10qxk")))) + (build-system meson-build-system) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. - ("gobject-introspection" ,gobject-introspection) + `(("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("vala" ,vala) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) ("gtk-doc" ,gtk-doc))) (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. - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ - (and (zero? (system* "gtkdocize")) - (zero? (system* "autoreconf" "-vif")))))))) + `(#:tests? #f)) ;libusb fails to initialize. Wonder what that is. (home-page "https://github.com/hughsie/libgusb") (synopsis "GLib binding for libusb1") (description |