public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spl: Make naming more consistent with zfs

Browse Source
This commit is contained in:
William A. Kennington III 2015-02-07 15:21:30 -08:00
parent ef80d73e6a
commit 161e9648e4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/os-specific/linux/spl/generic.nix
View File

@ -11,14 +11,15 @@
with stdenv.lib; with stdenv.lib;
let let
needsKernelSource = any (n: n == configFile) [ "kernel" "all" ]; buildKernel = any (n: n == configFile) [ "kernel" "all" ];
buildUser = any (n: n == configFile) [ "user" "all" ];
in in
assert any (n: n == configFile) [ "kernel" "user" "all" ]; assert any (n: n == configFile) [ "kernel" "user" "all" ];
assert needsKernelSource -> kernel != null; assert buildKernel -> kernel != null && spl != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "spl-${configFile}-${version}${optionalString needsKernelSource "-${kernel.version}"}"; name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
inherit version src patches; inherit version src patches;
@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--with-config=${configFile}" "--with-config=${configFile}"
] ++ optionals needsKernelSource [ ] ++ optionals buildKernel [
"--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source" "--with-linux=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
"--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "--with-linux-obj=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
]; ];