me
/
guix
Archived
1
0
Fork 0
Code

gnu: eudev: Build the hardware database. 

* gnu/packages/linux.scm (usbutils)[inputs]: Replace EUDEV-WITH-HWDB
by EUDEV.
(eudev)[arguments]: New field.
(eudev-with-hwdb): Define in terms of 'deprecated-package'.
master
Ludovic Courtès 2017-06-09 09:03:46 +02:00
parent 70eea6ea14
commit 4e859e9233
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gnu/packages/linux.scm
View File

@ -637,7 +637,7 @@ slabtop, and skill.")
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("libusb" ,libusb) `(("libusb" ,libusb)
("eudev" ,eudev-with-hwdb))) ("eudev" ,eudev)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(home-page "http://www.linux-usb.org/") (home-page "http://www.linux-usb.org/")
@ -1843,6 +1843,15 @@ from the module-init-tools project.")
(patches (search-patches "eudev-rules-directory.patch" (patches (search-patches "eudev-rules-directory.patch"
"eudev-conflicting-declaration.patch")))) "eudev-conflicting-declaration.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(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"))))))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("perl" ,perl) ("perl" ,perl)
@ -1861,19 +1870,7 @@ time.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public eudev-with-hwdb (define-public eudev-with-hwdb
;; TODO: Merge with 'eudev'. (deprecated-package "eudev-with-hwdb" 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 (define-public lvm2
(package (package