diff options
| author | Emil Karlson <jekarlson@gmail.com> | 2021-10-17 20:06:35 +0300 |
|---|---|---|
| committer | Emil Karlson <jekarlson@gmail.com> | 2021-10-20 13:11:28 +0300 |
| commit | 2ef28fb77d9f307a152468106be26204e22dd325 (patch) | |
| tree | c1a268ee597ac910778568455aa0cb2d2993a583 /pkgs/os-specific/linux/kernel/common-config.nix | |
| parent | 5f33ded6018c9bd2e203cd6d7bad4d6a62e46c2f (diff) | |
| download | nixpkgs-2ef28fb77d9f307a152468106be26204e22dd325.tar nixpkgs-2ef28fb77d9f307a152468106be26204e22dd325.tar.gz nixpkgs-2ef28fb77d9f307a152468106be26204e22dd325.tar.bz2 nixpkgs-2ef28fb77d9f307a152468106be26204e22dd325.tar.lz nixpkgs-2ef28fb77d9f307a152468106be26204e22dd325.tar.xz nixpkgs-2ef28fb77d9f307a152468106be26204e22dd325.tar.zst nixpkgs-2ef28fb77d9f307a152468106be26204e22dd325.zip | |
linux: do not build in DRM_SIMPLEDRM on newer kernels
After linux 5.14.11 FB_SIMPLE conflicts with DRM_SIMPLEDRM, which will fail configuration, when DRM_SIMPLEDRM is configured as a module and FB_SIMPLE gets requested as builtin. Do not enable DRM_SIMPLEDRM as a temporary workaround, until good enough migration path is found.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/common-config.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 717fdaee72a..019a8698c08 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -246,6 +246,8 @@ let FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER = whenAtLeast "4.19" yes; FRAMEBUFFER_CONSOLE_ROTATION = yes; FB_GEODE = mkIf (stdenv.hostPlatform.system == "i686-linux") yes; + # On 5.14 this conflicts with FB_SIMPLE. + DRM_SIMPLEDRM = whenAtLeast "5.14" no; }; video = { |