Merge pull request #721 from vcunat/p/hw-utils

pci and usb utils update

1 files changed, 14 insertions, 17 deletions

diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 78ff9131fa8b..3f63d077c7fa 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -1,29 +1,26 @@
-{ stdenv, fetchurl, zlib }:
+{ stdenv, fetchurl, pkgconfig, zlib, kmod, which }:
 
+let
+  pciids = fetchurl {
+    # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2.
+    url = http://tarballs.nixos.org/pci.ids.20120929.bz2;
+    sha256 = "1q3i479ay88wam1zz1vbgkbqb2axg8av9qjxaigrqbnw2pv0srmb";
+  };
+in
 stdenv.mkDerivation rec {
-  name = "pciutils-3.1.10";
+  name = "pciutils-3.2.0";
 
   src = fetchurl {
     url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2";
-    sha256 = "0xdahcxd00c921wnxi0f0w3lzjqdfphwa5vglfcpf0lv3l2w40pl";
+    sha256 = "0d9as9jzjjg5c1nwf58z1y1i7rf9fqxmww1civckhcvcn0xr85mq";
   };
 
-  buildInputs = [ zlib ];
-
-  pciids = fetchurl {
-    # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2.
-    url = http://tarballs.nixos.org/pci.ids.20120929.bz2;
-    sha256 = "1q3i479ay88wam1zz1vbgkbqb2axg8av9qjxaigrqbnw2pv0srmb";
-  };
+  buildInputs = [ pkgconfig zlib kmod which ];
 
-  # Override broken auto-detect logic.
-  # Note: we can't compress pci.ids (ZLIB=yes) because udev requires
-  # an uncompressed pci.ids.
-  makeFlags = "ZLIB=no DNS=yes SHARED=yes PREFIX=\${out}";
+  # currently up-to-date
+  #preBuild = "bunzip2 < ${pciids} > pci.ids";
 
-  preBuild = ''
-    bunzip2 < $pciids > pci.ids
-  '';
+  makeFlags = "SHARED=yes PREFIX=\${out}";
 
   installTargets = "install install-lib";