diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-12-12 18:55:17 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-12-12 18:55:17 +0000 |
| commit | 71ed6194e1c4fa17d8c6eae83e01ca38e05233d5 (patch) | |
| tree | 79d27a82c4591dc01c43a36fbb9138aa863e8609 /pkgs/os-specific/linux/kernel/generic.nix | |
| parent | 03e45e0cb4c56ec37088a7bc64001da02727dde6 (diff) | |
| download | nixlib-71ed6194e1c4fa17d8c6eae83e01ca38e05233d5.tar nixlib-71ed6194e1c4fa17d8c6eae83e01ca38e05233d5.tar.gz nixlib-71ed6194e1c4fa17d8c6eae83e01ca38e05233d5.tar.bz2 nixlib-71ed6194e1c4fa17d8c6eae83e01ca38e05233d5.tar.lz nixlib-71ed6194e1c4fa17d8c6eae83e01ca38e05233d5.tar.xz nixlib-71ed6194e1c4fa17d8c6eae83e01ca38e05233d5.tar.zst nixlib-71ed6194e1c4fa17d8c6eae83e01ca38e05233d5.zip | |
* Get fbcondecor to work.
* Barf on ignored options. svn path=/nixpkgs/branches/kernel-config/; revision=18914
Diffstat (limited to 'pkgs/os-specific/linux/kernel/generic.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 8e6bd462ed3f..85fd91ca1bbd 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -56,10 +56,8 @@ stdenv.mkDerivation { generateConfig = ./generate-config.pl; - inherit preConfigure; + inherit preConfigure src module_init_tools localVersion; - inherit src config; - patches = map (p: p.patch) kernelPatches; kernelConfig = @@ -77,13 +75,6 @@ stdenv.mkDerivation { if stdenv.system == "x86_64-linux" then "x86_64" else abort "Platform ${stdenv.system} is not supported."; - makeFlags = if userModeLinux then "ARCH=um SHELL=bash" else ""; - - inherit module_init_tools; - - allowLocalVersion = false; # don't allow patches to set a suffix - inherit localVersion; # but do allow the user to set one. - meta = { description = (if userModeLinux then |