Merge pull request #125097 from SebTM/update/usbutils_013

usbutils: 012 -> 013
This commit is contained in:
Maximilian Bosch 2021-06-01 18:36:30 +02:00 committed by GitHub
commit c4c7fc5c65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 9 deletions

View File

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, substituteAll, autoreconfHook, pkg-config, libusb1, hwdata , python3 }:
stdenv.mkDerivation rec {
name = "usbutils-012";
name = "usbutils-013";
src = fetchurl {
url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz";
sha256 = "0iiy0q7fzikavmdsjsb0sl9kp3gfh701qwyjjccvqh0qz4jlcqw8";
sha256 = "0f0klk6d3hmbpf6p4dcwa1qjzblmkhbxs1wsw87aidvqri7lj8wy";
};
patches = [

View File

@ -1,7 +1,7 @@
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,11 +51,11 @@
usbreset.c
@@ -61,7 +61,7 @@ EXTRA_DIST = \
LICENSES/GPL-3.0-only.txt
lsusb.py: $(srcdir)/lsusb.py.in
- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
@ -9,8 +9,3 @@
chmod 755 $@
lsusb.8: $(srcdir)/lsusb.8.in
- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@
+ sed 's|VERSION|$(VERSION)|g;s|@usbids@|@hwdata@/share/hwdata/usb.ids|g' $< >$@
usb-devices.1: $(srcdir)/usb-devices.1.in
sed 's|VERSION|$(VERSION)|g' $< >$@