colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

linux-megous: re-enable modem-power

Browse Source 
it's likely i won't be using eg25-manager after all and will have to manually boot the modem, so may as well use Megi's driver for that
This commit is contained in:
Colin 2023-08-18 02:20:38 +00:00
parent e7e86cae95
commit d7c912386f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/additional/linux-megous/default.nix
View File

@ -3,6 +3,8 @@
, fetchpatch , fetchpatch
, fetchFromGitHub , fetchFromGitHub
, pkgs , pkgs
# modem_power is incompatible with eg25-manager: <https://gitlab.com/mobian1/eg25-manager/-/issues/38>
, withModemPower ? true
# something inside nixpkgs calls `override` on the kernel and passes in extra arguments # something inside nixpkgs calls `override` on the kernel and passes in extra arguments
, ... , ...
}@args: }@args:
@ -41,8 +43,7 @@ let
SCHED_DEBUG = lib.mkForce no; # determines /sys/kernel/debug/sched SCHED_DEBUG = lib.mkForce no; # determines /sys/kernel/debug/sched
# SUNRPC_DEBUG = lib.mkForce no; # i use NFS though # SUNRPC_DEBUG = lib.mkForce no; # i use NFS though
# modem_power is incompatible with eg25-manager: <https://gitlab.com/mobian1/eg25-manager/-/issues/38> MODEM_POWER = lib.mkIf (!withModemPower) no;
MODEM_POWER = no;
# taken from mobile-nixos config?? or upstream megous config?? # taken from mobile-nixos config?? or upstream megous config??
RTL8723CS = module; RTL8723CS = module;
@ -111,6 +112,7 @@ let
pkgs.kernelPatches.bridge_stp_helper pkgs.kernelPatches.bridge_stp_helper
pkgs.kernelPatches.request_key_helper pkgs.kernelPatches.request_key_helper
# (patchDefconfig kernelConfig) # (patchDefconfig kernelConfig)
] ++ lib.optionals (!withModemPower) [
{ {
# Drop modem-power from DT to allow eg25-manager to have full control. # Drop modem-power from DT to allow eg25-manager to have full control.
# source: <https://github.com/NixOS/mobile-nixos/pull/573> # source: <https://github.com/NixOS/mobile-nixos/pull/573>