From 4fa4ab3a6ef91c2cd52065ba1c7816f2d4ceefc3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 24 Mar 2013 07:45:00 -0400 Subject: 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 --- pkgs/os-specific/linux/v86d/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/os-specific/linux/v86d/default.nix') diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index 220abf88ae7..698a7ab4ec8 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, klibc, kernel, withKlibc ? true}: +{stdenv, fetchurl, klibc, kernelDev, withKlibc ? true}: stdenv.mkDerivation rec { - name = "v86d-${version}-${kernel.version}"; + name = "v86d-${version}-${kernelDev.version}"; version = "0.1.10"; src = fetchurl { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = if withKlibc then [ "--with-klibc" ] else [ "--default" ]; makeFlags = [ - "KDIR=${kernel}/lib/modules/${kernel.modDirVersion}/source" + "KDIR=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/source" "DESTDIR=$(out)" ]; -- cgit 1.4.1