diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index ca1f698fa31..710a01ed03d 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -1,32 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, libusb1 }: - -let - - # Obtained from http://www.linux-usb.org/usb.ids.bz2. - usbids = fetchurl { - url = http://tarballs.nixos.org/usb.ids.20130821.bz2; - sha256 = "0x7mf4h5h5wjzhygfr4lc8yz0cwm7mahxrnp5nkxcmawmyxwsg53"; - }; - -in +{ stdenv, fetchurl, pkgconfig, libusb1, hwdata }: stdenv.mkDerivation rec { - name = "usbutils-007"; + name = "usbutils-008"; src = fetchurl { url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz"; - sha256 = "197gpbxnspy6ncqv5mziaikcfqgb3irbqqlfwjgzvh5v4hbs14vm"; + sha256 = "132clk14j4nm8crln2jymdbbc2vhzar2j2hnxyh05m79pbq1lx24"; }; buildInputs = [ pkgconfig libusb1 ]; - preBuild = "bunzip2 < ${usbids} > usb.ids"; - postInstall = '' rm $out/sbin/update-usbids.sh substituteInPlace $out/bin/lsusb.py \ - --replace /usr/share/usb.ids $out/share/usb.ids + --replace /usr/share/usb.ids ${hwdata}/data/hwdata/usb.ids ''; meta = {