diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-07-24 22:37:22 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-07-24 23:36:05 +0300 |
| commit | e0ce4bee57f4ba7443933692ee78ce1216e5a161 (patch) | |
| tree | 8617948d7da39e583786929597377b4acab9197c /pkgs/os-specific | |
| parent | 7098bcac278a2d028036bb3a23508fd1c52155ac (diff) | |
| download | nixlib-e0ce4bee57f4ba7443933692ee78ce1216e5a161.tar nixlib-e0ce4bee57f4ba7443933692ee78ce1216e5a161.tar.gz nixlib-e0ce4bee57f4ba7443933692ee78ce1216e5a161.tar.bz2 nixlib-e0ce4bee57f4ba7443933692ee78ce1216e5a161.tar.lz nixlib-e0ce4bee57f4ba7443933692ee78ce1216e5a161.tar.xz nixlib-e0ce4bee57f4ba7443933692ee78ce1216e5a161.tar.zst nixlib-e0ce4bee57f4ba7443933692ee78ce1216e5a161.zip | |
kernel: Remove empty preUnpack
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 3 |
2 files changed, 3 insertions, 4 deletions
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 = '' |