From e0ce4bee57f4ba7443933692ee78ce1216e5a161 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Tue, 24 Jul 2018 22:37:22 +0300 Subject: kernel: Remove empty preUnpack --- pkgs/os-specific/linux/kernel/generic.nix | 4 +++- pkgs/os-specific/linux/kernel/manual-config.nix | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 25078b7d753c..4af5e80a655a 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -105,7 +105,9 @@ let sed -e '/fflush(stdout);/i\printf("###");' -i scripts/kconfig/conf.c ''; - inherit (kernel) src patches preUnpack; + preUnpack = kernel.preUnpack or ""; + + inherit (kernel) src patches; buildPhase = '' export buildRoot="''${buildRoot:-build}" diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index b2171067307f..7d12af9811aa 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -90,9 +90,6 @@ let inherit src; - preUnpack = '' - ''; - patches = map (p: p.patch) kernelPatches; prePatch = '' -- cgit 1.4.1