public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel: don't force ignoreConfigErrors when cross compiling, only set the

Browse Source 
default
This commit is contained in:
Ben Wolsieffer 2018-01-13 21:12:06 -05:00
parent b4b04dd29f
commit a09709bf2a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -23,7 +23,8 @@
# symbolic name and `patch' is the actual patch. The patch may # symbolic name and `patch' is the actual patch. The patch may
# optionally be compressed with gzip or bzip2. # optionally be compressed with gzip or bzip2.
kernelPatches ? [] kernelPatches ? []
, ignoreConfigErrors ? hostPlatform.platform.name != "pc" , ignoreConfigErrors ? hostPlatform.platform.name != "pc" ||
hostPlatform != stdenv.buildPlatform
, extraMeta ? {} , extraMeta ? {}
, hostPlatform , hostPlatform
, ... , ...
@ -58,7 +59,7 @@ let
in lib.concatStringsSep "\n" ([baseConfig] ++ configFromPatches); in lib.concatStringsSep "\n" ([baseConfig] ++ configFromPatches);
configfile = stdenv.mkDerivation { configfile = stdenv.mkDerivation {
#inherit ignoreConfigErrors; inherit ignoreConfigErrors;
name = "linux-config-${version}"; name = "linux-config-${version}";
generateConfig = ./generate-config.pl; generateConfig = ./generate-config.pl;
@ -74,9 +75,6 @@ let
preferBuiltin = hostPlatform.platform.kernelPreferBuiltin or false; preferBuiltin = hostPlatform.platform.kernelPreferBuiltin or false;
arch = hostPlatform.platform.kernelArch; arch = hostPlatform.platform.kernelArch;
# TODO(@Ericson2314): No null next hash break
ignoreConfigErrors = if stdenv.hostPlatform == stdenv.buildPlatform then null else true;
crossAttrs = let crossAttrs = let
cp = hostPlatform.platform; cp = hostPlatform.platform;
in { in {