01/03: gnu: usbutils: Update to 012.

[guix-commits]

nckx pushed a commit to branch master
in repository guix.

commit 5b26635893ce6d86ce628e0a65a50848642bcdfe
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Thu May 9 00:36:31 2019 +0200

    gnu: usbutils: Update to 012.
    
    * gnu/packages/linux.scm (usbutils): Update to 012.
    [arguments]: Add ‘patch-bootstrap-scripts’ phase.
    [native-inputs]: Add autoconf, automake, and libtool.
---
 gnu/packages/linux.scm | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index cb31734..2a07188 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -815,21 +815,35 @@ slabtop, and skill.")
 (define-public usbutils
   (package
     (name "usbutils")
-    (version "010")
+    (version "012")
     (source
      (origin
       (method url-fetch)
       (uri (string-append "mirror://kernel.org/linux/utils/usb/usbutils/"
                           "usbutils-" version ".tar.xz"))
       (sha256
-       (base32
-        "06aag4jfgsfjxk563xsp9ik9nadihmasrr37a1gb0vwqni5kdiv1"))))
+       (base32 "0iiy0q7fzikavmdsjsb0sl9kp3gfh701qwyjjccvqh0qz4jlcqw8"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'bootstrap 'patch-bootstrap-scripts
+           (lambda _
+             (substitute* "usbhid-dump/bootstrap"
+               (("/bin/bash") (which "bash")))
+
+             ;; Don't let autogen.sh run configure with bogus options & CFLAGS.
+             (substitute* "autogen.sh"
+               (("^\\./configure.*") ""))
+             #t)))))
     (inputs
      `(("libusb" ,libusb)
        ("eudev" ,eudev)))
     (native-inputs
-     `(("pkg-config" ,pkg-config)))
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)
+       ("pkg-config" ,pkg-config)))
     (home-page "http://www.linux-usb.org/";)
     (synopsis
      "Tools for working with USB devices, such as lsusb")