From 516f839c0d88f3472e40aa4458b41b41c3ce013e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 24 Nov 2016 16:49:57 +0100
Subject: [PATCH] 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.
---
 pkgs/tools/system/pciutils/default.nix     |  2 --
 pkgs/tools/system/pciutils/module-dir.diff | 23 ----------------------
 2 files changed, 25 deletions(-)
 delete mode 100644 pkgs/tools/system/pciutils/module-dir.diff

diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 6530abd2362..622f5fc6cea 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -8,8 +8,6 @@ stdenv.mkDerivation rec {
     sha256 = "0byl2f897w5lhs4bvr6p7qwcz9bllj2zyfv7nywbcbsnb9ha9wrb";
   };
 
-  patches = [ ./module-dir.diff ];
-
   buildInputs = [ pkgconfig zlib kmod which ];
 
   makeFlags = "SHARED=yes PREFIX=\${out}";
diff --git a/pkgs/tools/system/pciutils/module-dir.diff b/pkgs/tools/system/pciutils/module-dir.diff
deleted file mode 100644
index ea38b115b24..00000000000
--- a/pkgs/tools/system/pciutils/module-dir.diff
+++ /dev/null
@@ -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");