Merge #43741: pciutils: 3.6.0 -> 3.6.1

This commit is contained in:
Vladimír Čunát 2018-07-21 20:51:55 +02:00
commit 17a0c57e68
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, zlib, kmod, which }:
stdenv.mkDerivation rec {
name = "pciutils-3.6.0"; # with database from 2018-06-29
name = "pciutils-3.6.1"; # with database from 2018-06-29
src = fetchurl {
url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz";
sha256 = "17g9rvjknj2yqwxldnz8m5kaabbdvkcjnfic4sbx88kh0s81197j";
sha256 = "1q39hh8scgvqppk1clzjh7yiq5p2r0knv52g3qzmdhsir4f47h7w";
};
nativeBuildInputs = [ pkgconfig ];
@ -22,16 +22,6 @@ 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";