From 4e54c31de06dd955922cdb1cb59324efd64d8ef0 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Sun, 14 Feb 2021 21:22:13 +0100 Subject: [PATCH] pciutils: use database from hwinfo which is easier to update --- pkgs/tools/system/pciutils/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index a89de032abd7..af9ef68dc24d 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, zlib, kmod, which +, hwdata , static ? stdenv.hostPlatform.isStatic , darwin ? null }: @@ -30,8 +31,15 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install-lib" ]; - # Get rid of update-pciids as it won't work. - postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8"; + postInstall = '' + # Remove update-pciids as it won't work on nixos + rm $out/sbin/update-pciids $out/man/man8/update-pciids.8 + + # use database from hwdata instead + # (we don't create a symbolic link because we do not want to pull in the + # full closure of hwdata) + cp --reflink=auto ${hwdata}/share/hwdata/pci.ids $out/share/pci.ids + ''; meta = with lib; { homepage = "http://mj.ucw.cz/pciutils.html";