diff options
| author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2018-01-13 21:12:06 -0500 |
|---|---|---|
| committer | Ben Wolsieffer <benwolsieffer@gmail.com> | 2018-01-15 12:39:45 -0500 |
| commit | a09709bf2a6571838aac2a05d7bd123e7a1d4fa9 (patch) | |
| tree | 9cc752ec5f5e1551d1872d893e1bb554843fa6b2 | |
| parent | b4b04dd29fe25ea8d690e87218c25ee222007c5b (diff) | |
| download | nixlib-a09709bf2a6571838aac2a05d7bd123e7a1d4fa9.tar nixlib-a09709bf2a6571838aac2a05d7bd123e7a1d4fa9.tar.gz nixlib-a09709bf2a6571838aac2a05d7bd123e7a1d4fa9.tar.bz2 nixlib-a09709bf2a6571838aac2a05d7bd123e7a1d4fa9.tar.lz nixlib-a09709bf2a6571838aac2a05d7bd123e7a1d4fa9.tar.xz nixlib-a09709bf2a6571838aac2a05d7bd123e7a1d4fa9.tar.zst nixlib-a09709bf2a6571838aac2a05d7bd123e7a1d4fa9.zip | |
kernel: don't force ignoreConfigErrors when cross compiling, only set the
default
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index d1733f96c536..8ff92ac1a0aa 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -23,7 +23,8 @@ # symbolic name and `patch' is the actual patch. The patch may # optionally be compressed with gzip or bzip2. kernelPatches ? [] -, ignoreConfigErrors ? hostPlatform.platform.name != "pc" +, ignoreConfigErrors ? hostPlatform.platform.name != "pc" || + hostPlatform != stdenv.buildPlatform , extraMeta ? {} , hostPlatform , ... @@ -58,7 +59,7 @@ let in lib.concatStringsSep "\n" ([baseConfig] ++ configFromPatches); configfile = stdenv.mkDerivation { - #inherit ignoreConfigErrors; + inherit ignoreConfigErrors; name = "linux-config-${version}"; generateConfig = ./generate-config.pl; @@ -74,9 +75,6 @@ let preferBuiltin = hostPlatform.platform.kernelPreferBuiltin or false; arch = hostPlatform.platform.kernelArch; - # TODO(@Ericson2314): No null next hash break - ignoreConfigErrors = if stdenv.hostPlatform == stdenv.buildPlatform then null else true; - crossAttrs = let cp = hostPlatform.platform; in { |