From 4aba2bb3f509681ff98c68d837437f058cf3dccd Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 1 Aug 2012 23:02:17 -0400 Subject: [PATCH] linux/manual-config: Use kernelPatches like generic.nix, not a plain patches list --- pkgs/os-specific/linux/kernel/manual-config.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index e2cee9c23e7c..6238509e8fa6 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -50,7 +50,7 @@ in # The kernel source (tarball, git checkout, etc.) src, # Any patches - patches ? [], + kernelPatches ? [], # The kernel .config file configfile, # Manually specified nixexpr representing the config @@ -86,10 +86,12 @@ stdenv.mkDerivation { enableParallelBuilding = true; passthru = { - inherit version modDirVersion config; + inherit version modDirVersion config kernelPatches; }; - inherit patches src; + inherit src; + + patches = map (p: p.patch) kernelPatches; prePatch = '' for mf in $(find -name Makefile -o -name Makefile.include -o -name install.sh); do