diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-10 12:25:45 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-10 12:25:45 +0000 |
| commit | 29daeec1099147c0f58e1dc999ed9cd31918e89d (patch) | |
| tree | 7d63dd9f2a98c5a739ddd0377f1bf374a7e6f2e6 /pkgs/tools/system/pciutils | |
| parent | 610aac30c39d7bbf0caf41e46d75e8842542facd (diff) | |
| download | nixpkgs-29daeec1099147c0f58e1dc999ed9cd31918e89d.tar nixpkgs-29daeec1099147c0f58e1dc999ed9cd31918e89d.tar.gz nixpkgs-29daeec1099147c0f58e1dc999ed9cd31918e89d.tar.bz2 nixpkgs-29daeec1099147c0f58e1dc999ed9cd31918e89d.tar.lz nixpkgs-29daeec1099147c0f58e1dc999ed9cd31918e89d.tar.xz nixpkgs-29daeec1099147c0f58e1dc999ed9cd31918e89d.tar.zst nixpkgs-29daeec1099147c0f58e1dc999ed9cd31918e89d.zip | |
* pciutils: build a shared libpci.
* pciutils: updated to the latest pci.ids. svn path=/nixpkgs/trunk/; revision=14490
Diffstat (limited to 'pkgs/tools/system/pciutils')
| -rw-r--r-- | pkgs/tools/system/pciutils/builder.sh | 10 | ||||
| -rw-r--r-- | pkgs/tools/system/pciutils/default.nix | 19 |
2 files changed, 11 insertions, 18 deletions
diff --git a/pkgs/tools/system/pciutils/builder.sh b/pkgs/tools/system/pciutils/builder.sh deleted file mode 100644 index 4cf93bef868..00000000000 --- a/pkgs/tools/system/pciutils/builder.sh +++ /dev/null @@ -1,10 +0,0 @@ -source $stdenv/setup - -preBuild=preBuild -preBuild() { - bunzip2 < $pciids > pci.ids -} - -makeFlags="PREFIX=$out $makeFlags" - -genericBuild diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 92ebcbdad06..d9ef0474c49 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,24 +1,27 @@ {stdenv, fetchurl, zlib}: stdenv.mkDerivation { - name = "pciutils-3.0.0"; - - builder = ./builder.sh; + name = "pciutils-3.1.2"; src = fetchurl { - url = mirror://kernel/software/utils/pciutils/pciutils-3.0.0.tar.bz2; - sha256 = "1q9j7w95ysy6c02j7p3z58y23n5v2cdjwy6hz8s9xzvnlr0ynpnh"; + url = mirror://kernel/software/utils/pciutils/pciutils-3.1.2.tar.bz2; + sha256 = "15wksvqcgdj0hvsp5irc1igiqid69rrzpc33qj9nlyssvyw40vpn"; }; buildInputs = [zlib]; pciids = fetchurl { - url = http://nixos.org/tarballs/pci.ids.20080830.bz2; - sha256 = "0nfjj9lsifmm6js9w0isrscirr1a7dj9ynppbc0g5i19rzrmwafy"; + # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2. + url = http://nixos.org/tarballs/pci.ids.20090220.bz2; + sha256 = "1zdp85vcxhgrw1rwcsa35pk4j1b3scb7i61gzghbcn2mrm9cwwd9"; }; # Override broken auto-detect logic. - makeFlags = "ZLIB=yes DNS=yes"; + makeFlags = "ZLIB=yes DNS=yes SHARED=yes PREFIX=\${out}"; + + preBuild = '' + bunzip2 < $pciids > pci.ids + ''; installTargets = "install install-lib"; |