summary refs log tree commit diff
diff options
context:
space:
mode:
authorSebastian Sellmeier <mail@sebastian-sellmeier.de>2021-05-31 20:31:25 +0200
committerSebastian Sellmeier <mail@sebastian-sellmeier.de>2021-05-31 20:31:25 +0200
commitbafd47b37015aec26832a110dc255c4e2282ee93 (patch)
tree1f64c2c5a7b9be6244fcca1325cc1d90f2496208
parent666075648ee0a3a416fcae720e1ee016aa824570 (diff)
downloadnixpkgs-bafd47b37015aec26832a110dc255c4e2282ee93.tar
nixpkgs-bafd47b37015aec26832a110dc255c4e2282ee93.tar.gz
nixpkgs-bafd47b37015aec26832a110dc255c4e2282ee93.tar.bz2
nixpkgs-bafd47b37015aec26832a110dc255c4e2282ee93.tar.lz
nixpkgs-bafd47b37015aec26832a110dc255c4e2282ee93.tar.xz
nixpkgs-bafd47b37015aec26832a110dc255c4e2282ee93.tar.zst
nixpkgs-bafd47b37015aec26832a110dc255c4e2282ee93.zip
usbutils: 012 -> 013
-rw-r--r--pkgs/os-specific/linux/usbutils/default.nix4
-rw-r--r--pkgs/os-specific/linux/usbutils/fix-paths.patch9
2 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index 9e298697d4b..fba025b29d9 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -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 = [
diff --git a/pkgs/os-specific/linux/usbutils/fix-paths.patch b/pkgs/os-specific/linux/usbutils/fix-paths.patch
index d75c68505ef..ef63a41e726 100644
--- a/pkgs/os-specific/linux/usbutils/fix-paths.patch
+++ b/pkgs/os-specific/linux/usbutils/fix-paths.patch
@@ -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' $< >$@