Revert "pciutils: fixup finding modules to libkmod's way"
This reverts commit 286c836b3f1421553c103758537929e596256e65. It's bigger rebuild than I expected, I'm sorry. Moving to staging.
This commit is contained in:
parent
286c836b3f
commit
516f839c0d
@ -8,8 +8,6 @@ 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}";
|
||||||
|
@ -1,23 +0,0 @@
|
|||||||
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");
|
|
Loading…
x
Reference in New Issue
Block a user