summary refs log tree commit diff
path: root/pkgs/os-specific/linux/usbutils
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-03-26 12:00:00 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-03-26 12:00:34 -0700
commit08995697de8838e526cd0b5a54f0e8225b25977c (patch)
tree0bb1b5170341e0bf3862dfe47cf342f912e5289e /pkgs/os-specific/linux/usbutils
parent4febebe9cf4d3614a1241cdd9c7bac03605998a7 (diff)
downloadnixpkgs-08995697de8838e526cd0b5a54f0e8225b25977c.tar
nixpkgs-08995697de8838e526cd0b5a54f0e8225b25977c.tar.gz
nixpkgs-08995697de8838e526cd0b5a54f0e8225b25977c.tar.bz2
nixpkgs-08995697de8838e526cd0b5a54f0e8225b25977c.tar.lz
nixpkgs-08995697de8838e526cd0b5a54f0e8225b25977c.tar.xz
nixpkgs-08995697de8838e526cd0b5a54f0e8225b25977c.tar.zst
nixpkgs-08995697de8838e526cd0b5a54f0e8225b25977c.zip
usbutils: 007 -> 008
Diffstat (limited to 'pkgs/os-specific/linux/usbutils')
-rw-r--r--pkgs/os-specific/linux/usbutils/default.nix20
1 files changed, 4 insertions, 16 deletions
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 = {