3
0
Fork 0
forked from mirrors/nixpkgs

pciutils: fixup finding modules to libkmod's way

Fixes #20683.
This commit is contained in:
Vladimír Čunát 2016-11-24 16:45:15 +01:00
parent f01dd648f5
commit ceda8cb203
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 25 additions and 0 deletions

View file

@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0byl2f897w5lhs4bvr6p7qwcz9bllj2zyfv7nywbcbsnb9ha9wrb"; sha256 = "0byl2f897w5lhs4bvr6p7qwcz9bllj2zyfv7nywbcbsnb9ha9wrb";
}; };
patches = [ ./module-dir.diff ];
buildInputs = [ pkgconfig zlib kmod which ]; buildInputs = [ pkgconfig zlib kmod which ];
makeFlags = "SHARED=yes PREFIX=\${out}"; makeFlags = "SHARED=yes PREFIX=\${out}";

View file

@ -0,0 +1,23 @@
Don't override libkmod's way of finding modules.
(We override that behavior in nixpkgs to fit nixos.)
diff --git a/ls-kernel.c b/ls-kernel.c
index 78b70f1..ecacd0e 100644
--- a/ls-kernel.c
+++ b/ls-kernel.c
@@ -29,13 +29,7 @@ show_kernel_init(void)
if (show_kernel_inited >= 0)
return show_kernel_inited;
- struct utsname uts;
- if (uname(&uts) < 0)
- die("uname() failed: %m");
- char *name = alloca(64 + strlen(uts.release));
- sprintf(name, "/lib/modules/%s", uts.release);
-
- kmod_ctx = kmod_new(name, NULL);
+ kmod_ctx = kmod_new(NULL, NULL);
if (!kmod_ctx)
{
fprintf(stderr, "lspci: Unable to initialize libkmod context\n");