From ae87533ba16cfe9bd2a77132df0080e9ab5fd9a5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 9 Feb 2023 19:48:31 +0200 Subject: [PATCH] linuxHeaders: cleanup android compared output and the build log and python2 is not required both build 'pkgsCross.aarch64-android.linuxHeaders' 'pkgsCross.aarch64-android.bionic.linuxHeaders' linux-headers> LEX scripts/kconfig/lexer.lex.c linux-headers> sh: line 1: flex: command not found linux-headers> YACC scripts/kconfig/parser.tab.[ch] linux-headers> sh: line 1: bison: command not found linux-headers> INSTALL ./usr/include linux-headers> sh: line 1: rsync: command not found Co-authored-by: exarkun --- pkgs/os-specific/linux/kernel-headers/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 34fbde9d676a..a64787cac1eb 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -1,11 +1,8 @@ { stdenvNoCC, lib, buildPackages, fetchurl, perl, elf-header -, bison ? null, flex ? null, python ? null, rsync ? null +, bison, flex, rsync , writeTextFile }: -assert stdenvNoCC.hostPlatform.isAndroid -> - (flex != null && bison != null && python != null && rsync != null); - let # As part of building a hostPlatform=mips kernel, Linux creates and runs a @@ -50,7 +47,7 @@ let nativeBuildInputs = [ perl elf-header ] ++ lib.optionals stdenvNoCC.hostPlatform.isAndroid [ - flex bison python rsync + bison flex rsync ] ++ lib.optionals (stdenvNoCC.buildPlatform.isDarwin && stdenvNoCC.hostPlatform.isMips) [ darwin-endian-h