diff options
author | Shea Levy <shea@shealevy.com> | 2013-03-24 07:45:00 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2013-03-24 07:45:00 -0400 |
commit | 4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3 (patch) | |
tree | 9ba4a2c3ffcee27f93accfb9115bd44bf49a0a2c /pkgs/os-specific/linux/klibc | |
parent | f8fb55b4cc2809dc02c9ca392802716d78d5f4c3 (diff) |
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>
Diffstat (limited to 'pkgs/os-specific/linux/klibc')
-rw-r--r-- | pkgs/os-specific/linux/klibc/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index 42fd6097da0be..97bdd9ebacb20 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, bison, mktemp, linuxHeaders, linuxHeadersCross, kernel ? null }: +{ stdenv, fetchurl, perl, bison, mktemp, linuxHeaders, linuxHeadersCross, kernelDev ? null }: assert stdenv.isLinux; @@ -8,7 +8,7 @@ let in stdenv.mkDerivation { - name = "klibc-${version}${stdenv.lib.optionalString (kernel != null) "-${kernel.version}"}"; + name = "klibc-${version}${stdenv.lib.optionalString (kernelDev != null) "-${kernelDev.version}"}"; src = fetchurl { url = "mirror://kernel/linux/libs/klibc/1.5/klibc-${version}.tar.bz2"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { # So it cannot run the 'make headers_install' it wants to run. # We don't install the headers, so klibc will not be useful as libc, but # usually in nixpkgs we only use the userspace tools comming with klibc. - prePatch = stdenv.lib.optionalString (kernel == null) '' + prePatch = stdenv.lib.optionalString (kernelDev == null) '' sed -i -e /headers_install/d scripts/Kbuild.install ''; @@ -49,15 +49,15 @@ stdenv.mkDerivation { echo "CONFIG_AEABI=y" >> defconfig makeFlags=$(eval "echo $makeFlags") - '' + (if kernel == null then '' + '' + (if kernelDev == null then '' mkdir linux cp -prsd $linuxHeaders/include linux/ chmod -R u+w linux/include/ '' else '' - tar xvf ${kernel.src} + tar xvf ${kernelDev.src} mv linux* linux cd linux - ln -sv ${kernel}/config .config + ln -sv ${kernelDev}/config .config make prepare cd .. ''); |