diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-17 10:06:32 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-17 10:06:32 +0200 |
| commit | 9f208b5d8aa10518eb92ed5b7d77e4a588b5154c (patch) | |
| tree | e521ba305aa4848b216a15e2eac0e69acdb0d1e9 /pkgs/tools/system | |
| parent | 9d0336a2bbe933c1a8e6ea7c7b39eb7ff071ef66 (diff) | |
| parent | 12949bf84ab06bebb854a07082bf5c32f5e14892 (diff) | |
| download | nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.gz nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.bz2 nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.lz nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.xz nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.tar.zst nixlib-9f208b5d8aa10518eb92ed5b7d77e4a588b5154c.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/pciutils/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 0ee17ffcc38b..9acf41c62ef8 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -22,6 +22,16 @@ stdenv.mkDerivation rec { installTargets = "install install-lib"; + # Use standardized and equivalent realpath(path, NULL) instead of canonicalize_file_name(path). + # This is documented to be equivalent, see `man 3 canonicalize_file_name`. + # Fixes w/musl. + # Upstream PR: https://github.com/pciutils/pciutils/pull/6 + postPatch = '' + substituteInPlace lib/sysfs.c \ + --replace "canonicalize_file_name(path)" \ + "realpath(path, NULL)" + ''; + # Get rid of update-pciids as it won't work. postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8"; |