diff options
author | Shea Levy <shea@shealevy.com> | 2012-07-29 04:31:40 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2012-07-29 04:31:40 -0400 |
commit | a9a70856845625bd6b9f988d07553774f88d18d4 (patch) | |
tree | 19236e2cf930664934a9609ea0d67adbe5bd748b /pkgs/os-specific/linux/kernel | |
parent | 6bb20c7ba21071f020a312370c03f145b35546d9 (diff) | |
download | nixpkgs-a9a70856845625bd6b9f988d07553774f88d18d4.tar nixpkgs-a9a70856845625bd6b9f988d07553774f88d18d4.tar.gz nixpkgs-a9a70856845625bd6b9f988d07553774f88d18d4.tar.bz2 nixpkgs-a9a70856845625bd6b9f988d07553774f88d18d4.tar.lz nixpkgs-a9a70856845625bd6b9f988d07553774f88d18d4.tar.xz nixpkgs-a9a70856845625bd6b9f988d07553774f88d18d4.tar.zst nixpkgs-a9a70856845625bd6b9f988d07553774f88d18d4.zip |
linux/kernel/manual-config: Allow manually specifying features, cleanup
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
-rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index d6cf3bf7612..730983d895f 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,7 +1,5 @@ { stdenv, runCommand, nettools, perl, kmod }: -{ version, modDirVersion ? version, src, patches ? [], config }: - with stdenv.lib; let @@ -39,13 +37,25 @@ let modular = isYes "MODULES"; }; - features = readFeatures config; - - commonMakeFlags = [ - "O=../build" - ]; in +{ + # The kernel version + version, + # The version of the kernel module directory + modDirVersion ? version, + # The kernel source (tarball, git checkout, etc.) + src, + # Any patches + patches ? [], + # The kernel .config file + config, + # Manually specified features the kernel supports + features ? readFeatures config +}: + +let commonMakeFlags = [ "O=../build" ]; in + stdenv.mkDerivation ({ name = "linux-${version}"; |