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/spl | |
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/spl')
-rw-r--r-- | pkgs/os-specific/linux/spl/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index b07a51c1ace3f..3d949511af0ae 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }: +{ stdenv, fetchurl, kernelDev, perl, autoconf, automake, libtool, coreutils, gawk }: stdenv.mkDerivation { - name = "spl-0.6.0-rc14-${kernel.version}"; + name = "spl-0.6.0-rc14-${kernelDev.version}"; src = fetchurl { url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.0-rc14.tar.gz; sha256 = "00wyamf13z8ins4s14xf0b3hfjfz4w084mr17hs3k5xifb5jxa8g"; @@ -9,9 +9,9 @@ stdenv.mkDerivation { patches = [ ./install_prefix.patch ./install_prefix_2.patch ./module_prefix.patch ]; - buildInputs = [ perl kernel autoconf automake libtool ]; + buildInputs = [ perl kernelDev autoconf automake libtool ]; - NIX_CFLAGS_COMPILE = "-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated"; + NIX_CFLAGS_COMPILE = "-I${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build/include/generated"; preConfigure = '' ./autogen.sh @@ -25,8 +25,8 @@ stdenv.mkDerivation { ''; configureFlags = '' - --with-linux=${kernel}/lib/modules/${kernel.modDirVersion}/build - --with-linux-obj=${kernel}/lib/modules/${kernel.modDirVersion}/build + --with-linux=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build + --with-linux-obj=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build ''; meta = { |