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>
This commit is contained in:
Shea Levy
2013-03-24 07:45:00 -04:00
parent f8fb55b4cc
commit 4fa4ab3a6e
34 changed files with 228 additions and 225 deletions

View File

@@ -1,14 +1,14 @@
{ stdenv, fetchurl, kernel}:
{ stdenv, fetchurl, kernelDev}:
stdenv.mkDerivation rec {
name = "open-iscsi-2.0-871-${kernel.version}";
name = "open-iscsi-2.0-871-${kernelDev.version}";
src = fetchurl {
url = "http://www.open-iscsi.org/bits/${name}.tar.gz";
sha256 = "1jvx1agybaj4czhz41bz37as076spicsmlh5pjksvwl2mr38gsmw";
};
KSRC = "${kernel}/lib/modules/*/build";
KSRC = "${kernelDev}/lib/modules/*/build";
DESTDIR = "$(out)";
preConfigure = ''