summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-01-12 10:10:02 +0100
committerLudovic Courtès <ludo@gnu.org>2017-01-12 10:13:35 +0100
commite5d861f30568ec0265565af551289fc2033743c7 (patch)
tree96015d57902a6e6ef55b380476f65e76bb057cba
parentc5173d74d67b786c36dd53930c5d4fe4805cf3e9 (diff)
downloadguix-e5d861f30568ec0265565af551289fc2033743c7.tar.gz
gnu: eudev: Add 'eudev-with-hwdb' variant that contains 'hwdb.bin'.
* gnu/packages/linux.scm (eudev-with-hwdb): New variable.
(usbutils)[inputs]: Use it instead of EUDEV.
-rw-r--r--gnu/packages/linux.scm17
1 files changed, 16 insertions, 1 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 716845d66e..dc0fc079b7 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -597,7 +597,7 @@ slabtop, and skill.")
     (build-system gnu-build-system)
     (inputs
      `(("libusb" ,libusb)
-       ("eudev" ,eudev)))
+       ("eudev" ,eudev-with-hwdb)))
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "http://www.linux-usb.org/")
@@ -1740,6 +1740,21 @@ device nodes from /dev/, handles hotplug events and loads drivers at boot
 time.")
     (license license:gpl2+)))
 
+(define-public eudev-with-hwdb
+  ;; TODO: Merge with 'eudev'.
+  (package
+    (inherit eudev)
+    (name "eudev-with-hwdb")
+    (arguments
+     '(#:phases (modify-phases %standard-phases
+                  (add-after 'install 'build-hwdb
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      ;; Build OUT/etc/udev/hwdb.bin.  This allows 'lsusb' and
+                      ;; similar tools to display product names.
+                      (let ((out (assoc-ref outputs "out")))
+                        (zero? (system* (string-append out "/bin/udevadm")
+                                        "hwdb" "--update"))))))))))
+
 (define-public lvm2
   (package
     (name "lvm2")