diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-07 03:41:24 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-07 03:41:24 +0200 |
| commit | 4c6c919a3141b14c3e90607f171e534a82eceeb0 (patch) | |
| tree | 9ea646e0f14fa84fa38a545a4edc33926208db96 /pkgs/os-specific/linux/kernel/generic.nix | |
| parent | 335ae386741f74c63cf3bf4b7022a1e5e5f26066 (diff) | |
| parent | fc1224d55dfdde0a3e43635fc9465cdff0bb80a3 (diff) | |
| download | nixpkgs-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar nixpkgs-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.gz nixpkgs-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.bz2 nixpkgs-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.lz nixpkgs-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.xz nixpkgs-4c6c919a3141b14c3e90607f171e534a82eceeb0.tar.zst nixpkgs-4c6c919a3141b14c3e90607f171e534a82eceeb0.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts: pkgs/os-specific/linux/kernel/generic.nix
Diffstat (limited to 'pkgs/os-specific/linux/kernel/generic.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 5a5081e5efb..ebd889d1a99 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -55,7 +55,7 @@ let config = import ./common-config.nix { inherit stdenv version ; # append extraConfig for backwards compatibility but also means the user can't override the kernelExtraConfig part - extraConfig = extraConfig + lib.optionalString (hostPlatform ? kernelExtraConfig ) hostPlatform.kernelExtraConfig; + extraConfig = extraConfig + lib.optionalString (hostPlatform.platform ? kernelExtraConfig) hostPlatform.platform.kernelExtraConfig; features = kernelFeatures; # Ensure we know of all extra patches, etc. }; |