cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #113151 from iblech/patch-pciutils

Browse source
This commit is contained in:
Sandro 2021-02-17 02:49:05 +01:00 committed by GitHub
commit f0c82514df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/os-specific/linux/hwdata/default.nix
View file

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://github.com/vcrhonek/hwdata";
description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.all;
};
}

12
pkgs/tools/system/pciutils/default.nix
View file

@ -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";