diff options
Diffstat (limited to 'pkgs/os-specific/linux/zfs/default.nix')
-rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 33a5dbc0735f..8da4906f8fe1 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: +{ stdenv, fetchurl, kernelDev, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: stdenv.mkDerivation { - name = "zfs-0.6.0-rc14-${kernel.version}"; + name = "zfs-0.6.0-rc14-${kernelDev.version}"; src = fetchurl { url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.0-rc14.tar.gz; @@ -10,11 +10,11 @@ stdenv.mkDerivation { patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ./no_absolute_paths_to_coreutils.patch ]; - buildInputs = [ kernel spl perl autoconf automake libtool zlib libuuid coreutils ]; + buildInputs = [ kernelDev spl perl autoconf automake libtool zlib libuuid coreutils ]; # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work NIX_CFLAGS_LINK = "-lgcc_s"; - 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 @@ -29,9 +29,9 @@ stdenv.mkDerivation { ''; configureFlags = '' - --with-linux=${kernel}/lib/modules/${kernel.modDirVersion}/build - --with-linux-obj=${kernel}/lib/modules/${kernel.modDirVersion}/build - --with-spl=${spl}/libexec/spl/${kernel.modDirVersion} + --with-linux=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build + --with-linux-obj=${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build + --with-spl=${spl}/libexec/spl/${kernelDev.modDirVersion} ${if stdenv.system == "i686-linux" then "--enable-atomic-spinlocks" else ""} ''; |