public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pciutils: update 

This breaks udev145 due to enabling compression again,
but I rather think we should remove udev145 (not used anywhere).
This commit is contained in:
Vladimír Čunát 2013-07-06 10:34:17 +02:00
parent 6726776c74
commit 52ed09d210
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/tools/system/pciutils/default.nix
View File

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