Partially revert my recent kernelPackages changes

First, pass in `self' again so that overriding works properly (thanks
for pointing that out, @edolstra)

Second, instead of having linuxPackages*.kernel mean something different
inside the set and out, add a new attribute linuxPackages*.kernelDev,
which for the generic kernel is simply linuxPackages*.kernel but for the
manual-config kernel is the `dev' output (which has the build tree,
source tree, etc.)

The second change required trivial modifications in a bunch of
expressions, I verified that all of the linuxPackages* sets defined in
all-packages.nix have the same drv paths before and after the change.

Signed-off-by: Shea Levy <shea@shealevy.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix
index 709befd9dc5..8d1320afc68 100644
--- a/pkgs/os-specific/linux/e1000e/default.nix
+++ b/pkgs/os-specific/linux/e1000e/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, kernel }:
+{ stdenv, fetchurl, kernelDev }:
 
 stdenv.mkDerivation {
-  name = "e1000e-1.5.1-${kernel.version}";
+  name = "e1000e-1.5.1-${kernelDev.version}";
 
   src = fetchurl {
     url = "http://downloads.sourceforge.net/e1000/e1000e-1.5.1.tar.gz";
     sha256 = "0nzjlarpqcpm5y112n3vzra4qv32hiygpfkk10y8g4nln4adhqsw";
   };
 
-  buildInputs = [ kernel ];
+  buildInputs = [ kernelDev ];
 
   configurePhase = ''
     cd src
-    kernel_version=$( cd ${kernel}/lib/modules && echo * )
-    sed -i -e 's|/lib/modules|${kernel}/lib/modules|' Makefile
+    kernel_version=$( cd ${kernelDev}/lib/modules && echo * )
+    sed -i -e 's|/lib/modules|${kernelDev}/lib/modules|' Makefile
     export makeFlags="BUILD_KERNEL=$kernel_version"
   '';