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, 4 insertions, 4 deletions

diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix
index c41649e0285b..109faac97c5e 100644
--- a/pkgs/os-specific/linux/ndiswrapper/default.nix
+++ b/pkgs/os-specific/linux/ndiswrapper/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, kernel, perl }:
+{ stdenv, fetchurl, kernelDev, perl }:
 
 stdenv.mkDerivation {
-  name = "ndiswrapper-1.56-${kernel.version}";
+  name = "ndiswrapper-1.56-${kernelDev.version}";
 
   # need at least .config and include 
-  inherit kernel;
+  kernel = kernelDev;
 
   buildPhase = "
     echo make KBUILD=$(echo \$kernel/lib/modules/*/build);
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
     sha256 = "10yqg1a08v6z1qm1qr1v4rbhl35c90gzrazapr09vp372hky8f57";
   };
 
-  buildInputs = [ kernel perl ];
+  buildInputs = [ kernelDev perl ];
 
   # this is a patch against svn head, not stable version
   patches = [./prefix.patch];