From a09709bf2a6571838aac2a05d7bd123e7a1d4fa9 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 13 Jan 2018 21:12:06 -0500
Subject: [PATCH] kernel: don't force ignoreConfigErrors when cross compiling,
 only set the default

---
 pkgs/os-specific/linux/kernel/generic.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index d1733f96c53..8ff92ac1a0a 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 {