diff options
author | Will Dietz <github@wdtz.org> | 2018-07-09 17:08:48 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-09 17:08:48 -0500 |
commit | 301559c1ea694092a92d72220d3ed4e09cbcd8c1 (patch) | |
tree | 5aca74870c7e76d265f513e4642473efce59dda6 /pkgs/tools | |
parent | c7e7cd7b9c24edfe07861cd0f88c9c28e1abcdd3 (diff) | |
parent | f8db20fb3ae382eba1ba2b160fe24739f43c0bd7 (diff) | |
download | nixlib-301559c1ea694092a92d72220d3ed4e09cbcd8c1.tar nixlib-301559c1ea694092a92d72220d3ed4e09cbcd8c1.tar.gz nixlib-301559c1ea694092a92d72220d3ed4e09cbcd8c1.tar.bz2 nixlib-301559c1ea694092a92d72220d3ed4e09cbcd8c1.tar.lz nixlib-301559c1ea694092a92d72220d3ed4e09cbcd8c1.tar.xz nixlib-301559c1ea694092a92d72220d3ed4e09cbcd8c1.tar.zst nixlib-301559c1ea694092a92d72220d3ed4e09cbcd8c1.zip |
Merge pull request #43267 from dtzWill/fix/pciutils-3.6.0-musl
pciutils: use standardized equivalent for canonicalize_file_name
Diffstat (limited to 'pkgs/tools')
-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"; |