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,10 +1,10 @@
{ stdenv, fetchurl, which, autoconf, automake, flex, yacc,
kernel, glibc, ncurses, perl, krb5 }:
kernelDev, glibc, ncurses, perl, krb5 }:
assert stdenv.isLinux;
stdenv.mkDerivation {
name = "openafs-1.6.1-${kernel.version}";
name = "openafs-1.6.1-${kernelDev.version}";
src = fetchurl {
url = http://www.openafs.org/dl/openafs/1.6.1/openafs-1.6.1-src.tar.bz2;
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
buildInputs = [ autoconf automake flex yacc ncurses perl which ];
preConfigure = ''
ln -s ${kernel}/lib/modules/*/build $TMP/linux
ln -s ${kernelDev}/lib/modules/*/build $TMP/linux
patchShebangs .
for i in `grep -l -R '/usr/\(include\|src\)' .`; do