diff --git a/pkgs/by-name/us/usbutils/fix-paths.patch b/pkgs/by-name/us/usbutils/fix-paths.patch index ef63a41e726c..af522ac50d7b 100644 --- a/pkgs/by-name/us/usbutils/fix-paths.patch +++ b/pkgs/by-name/us/usbutils/fix-paths.patch @@ -1,11 +1,14 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -61,7 +61,7 @@ EXTRA_DIST = \ - LICENSES/GPL-3.0-only.txt +diff --git a/lsusb.py b/lsusb.py +index bbc4dbb..8af1b1f 100755 +--- a/lsusb.py ++++ b/lsusb.py +@@ -27,8 +27,7 @@ showwakeup = False - lsusb.py: $(srcdir)/lsusb.py.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' $< >$@ - chmod 755 $@ + prefix = "/sys/bus/usb/devices/" + usbids = [ +- "/usr/share/hwdata/usb.ids", +- "/usr/share/usb.ids", ++ "@hwdata@/share/hwdata/usb.ids", + ] + cols = ("", "", "", "", "", "") - lsusb.8: $(srcdir)/lsusb.8.in diff --git a/pkgs/by-name/us/usbutils/package.nix b/pkgs/by-name/us/usbutils/package.nix index 3ffd5fe88a66..627069dafd65 100644 --- a/pkgs/by-name/us/usbutils/package.nix +++ b/pkgs/by-name/us/usbutils/package.nix @@ -3,7 +3,8 @@ stdenv, fetchurl, substituteAll, - autoreconfHook, + meson, + ninja, pkg-config, libusb1, hwdata, @@ -12,11 +13,11 @@ stdenv.mkDerivation rec { pname = "usbutils"; - version = "017"; + version = "018"; src = fetchurl { url = "mirror://kernel/linux/utils/usb/usbutils/usbutils-${version}.tar.xz"; - hash = "sha256-pqJf/c+RA+ONekRzKsoXBz9OYCuS5K5VYlIxqCcC4Fs="; + hash = "sha256-g/aLWbWFR1icACZugmcYZGJ1k6tDYtjIB/UO6pI8rZM="; }; patches = [ @@ -27,7 +28,8 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - autoreconfHook + meson + ninja pkg-config ]; buildInputs = [ @@ -41,10 +43,6 @@ stdenv.mkDerivation rec { "python" ]; - postBuild = '' - $CC $NIX_CFLAGS -o usbreset usbreset.c - ''; - postInstall = '' moveToOutput "bin/lsusb.py" "$python" install -Dm555 usbreset -t $out/bin