diff options
author | Atemu <atemu.main@gmail.com> | 2023-03-30 13:29:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-30 13:29:36 +0200 |
commit | 88b86dc02bb3545ef43181c5b407a9e4134d058e (patch) | |
tree | 6419c7bef5b1f7f6344e15fc50ce961ed642c4a0 | |
parent | 515452c22371c7b05884e045f2a254bf9161851a (diff) | |
parent | d645bba8c80a377271e0d0d53617738fa4a00aed (diff) | |
download | nixpkgs-88b86dc02bb3545ef43181c5b407a9e4134d058e.tar nixpkgs-88b86dc02bb3545ef43181c5b407a9e4134d058e.tar.gz nixpkgs-88b86dc02bb3545ef43181c5b407a9e4134d058e.tar.bz2 nixpkgs-88b86dc02bb3545ef43181c5b407a9e4134d058e.tar.lz nixpkgs-88b86dc02bb3545ef43181c5b407a9e4134d058e.tar.xz nixpkgs-88b86dc02bb3545ef43181c5b407a9e4134d058e.tar.zst nixpkgs-88b86dc02bb3545ef43181c5b407a9e4134d058e.zip |
Merge pull request #223694 from ionutnechita/local/kernel_android_option
android: with new kernel versions this option is no longer necessary
-rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index faa98ee8fe3..bee04112ad6 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -966,7 +966,7 @@ let FSL_MC_UAPI_SUPPORT = mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "5.12" yes); ASHMEM = { optional = true; tristate = whenBetween "5.0" "5.18" "y";}; - ANDROID = { optional = true; tristate = whenAtLeast "5.0" "y";}; + ANDROID = { optional = true; tristate = whenBetween "5.0" "5.19" "y";}; ANDROID_BINDER_IPC = { optional = true; tristate = whenAtLeast "5.0" "y";}; ANDROID_BINDERFS = { optional = true; tristate = whenAtLeast "5.0" "y";}; ANDROID_BINDER_DEVICES = { optional = true; freeform = whenAtLeast "5.0" "binder,hwbinder,vndbinder";}; |