diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-12-29 22:45:53 +0100 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-12-29 22:45:53 +0100 |
commit | 84d8ef6e2fc869b5405a9a2590d848283a48a10b (patch) | |
tree | a571dde71f34c003b5fab5a46a6bf3a85bcb8c5d /pkgs/os-specific | |
parent | 1fb0d3d158c193af1ee7fa6b0f9744df9f5a1484 (diff) | |
download | nixlib-84d8ef6e2fc869b5405a9a2590d848283a48a10b.tar nixlib-84d8ef6e2fc869b5405a9a2590d848283a48a10b.tar.gz nixlib-84d8ef6e2fc869b5405a9a2590d848283a48a10b.tar.bz2 nixlib-84d8ef6e2fc869b5405a9a2590d848283a48a10b.tar.lz nixlib-84d8ef6e2fc869b5405a9a2590d848283a48a10b.tar.xz nixlib-84d8ef6e2fc869b5405a9a2590d848283a48a10b.tar.zst nixlib-84d8ef6e2fc869b5405a9a2590d848283a48a10b.zip |
linuxPackages.spl: simplify expression
This package only contains a kernel module.
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/spl/default.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index f3bd283327c8..d055aaacf92e 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,21 +1,18 @@ { fetchFromGitHub, stdenv, autoreconfHook, coreutils, gawk -, configFile ? "all" # Kernel dependencies -, kernel ? null +, kernel }: with stdenv.lib; let - buildKernel = any (n: n == configFile) [ "kernel" "all" ]; - buildUser = any (n: n == configFile) [ "user" "all" ]; common = { version , sha256 , rev ? "spl-${version}" , broken ? false } @ args : stdenv.mkDerivation rec { - name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; + name = "spl-${version}-${kernel.version}"; src = fetchFromGitHub { owner = "zfsonlinux"; @@ -25,7 +22,7 @@ let patches = [ ./const.patch ./install_prefix.patch ]; - nativeBuildInputs = [ autoreconfHook ] ++ optional (kernel != null) kernel.moduleBuildDependencies; + nativeBuildInputs = [ autoreconfHook ] ++ kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; @@ -37,8 +34,7 @@ let ''; configureFlags = [ - "--with-config=${configFile}" - ] ++ optionals buildKernel [ + "--with-config=kernel" "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; @@ -62,8 +58,7 @@ let }; }; in - assert any (n: n == configFile) [ "kernel" "user" "all" ]; - assert buildKernel -> kernel != null; + assert kernel != null; { splStable = common { version = "0.7.4"; |