summary refs log tree commit diff
path: root/pkgs/os-specific/linux/usbutils
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-08 13:24:50 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-10-14 12:47:04 +0200
commit15f293e0e6ede5c04c940aef7840fe2ad0d1e7e9 (patch)
tree90fed5b81c00a1f7e65031e0d780252a0b1596f2 /pkgs/os-specific/linux/usbutils
parentd9be549a4c3523935437d6167a16c387e1c6d4ff (diff)
downloadnixpkgs-15f293e0e6ede5c04c940aef7840fe2ad0d1e7e9.tar
nixpkgs-15f293e0e6ede5c04c940aef7840fe2ad0d1e7e9.tar.gz
nixpkgs-15f293e0e6ede5c04c940aef7840fe2ad0d1e7e9.tar.bz2
nixpkgs-15f293e0e6ede5c04c940aef7840fe2ad0d1e7e9.tar.lz
nixpkgs-15f293e0e6ede5c04c940aef7840fe2ad0d1e7e9.tar.xz
nixpkgs-15f293e0e6ede5c04c940aef7840fe2ad0d1e7e9.tar.zst
nixpkgs-15f293e0e6ede5c04c940aef7840fe2ad0d1e7e9.zip
usbutils: Update USB IDs
Also, don't install update-usbids.sh (doesn't make sense) and fix
lsusb.py.
Diffstat (limited to 'pkgs/os-specific/linux/usbutils')
-rw-r--r--pkgs/os-specific/linux/usbutils/default.nix14
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index b7d139a534f..aff730e387a 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -4,8 +4,8 @@ let
 
   # Obtained from http://www.linux-usb.org/usb.ids.bz2.
   usbids = fetchurl {
-    url = http://tarballs.nixos.org/usb.ids.20120920.bz2;
-    sha256 = "0sz860g7grf6kx22p49s6j8h85c69ymcw16a8110klzfl9hl9hli";
+    url = http://tarballs.nixos.org/usb.ids.20130821.bz2;
+    sha256 = "0x7mf4h5h5wjzhygfr4lc8yz0cwm7mahxrnp5nkxcmawmyxwsg53";
   };
 
 in
@@ -20,8 +20,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig libusb1 ];
 
-  # currently up-to-date
-  #preBuild = "bunzip2 < ${usbids} > usb.ids";
+  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
+    '';
 
   meta = {
     homepage = http://www.linux-usb.org/;