lol

tlp: use module_init_tools, avoid recompilation for nixos

+6 -3
+4 -1
nixos/modules/services/hardware/tlp.nix
··· 10 10 11 11 tlp = pkgs.tlp.override { 12 12 inherit enableRDW; 13 - kmod = config.system.sbin.modprobe; 14 13 }; 15 14 16 15 # XXX: We can't use writeTextFile + readFile here because it triggers ··· 69 68 ExecStart = "${tlp}/bin/tlp init start"; 70 69 ExecStop = "${tlp}/bin/tlp init stop"; 71 70 }; 71 + 72 + environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/"; 72 73 }; 73 74 74 75 tlp-sleep = { ··· 87 88 ExecStart = "${tlp}/bin/tlp suspend"; 88 89 ExecStop = "${tlp}/bin/tlp resume"; 89 90 }; 91 + 92 + environment.MODULE_DIR="/run/current-system/kernel-modules/lib/modules/"; 90 93 }; 91 94 }; 92 95
+2 -2
pkgs/tools/misc/tlp/default.nix
··· 1 1 { stdenv, lib, fetchFromGitHub, makeWrapper, perl, systemd, iw, rfkill, hdparm, ethtool, inetutils 2 - , kmod, pciutils, smartmontools, x86_energy_perf_policy 2 + , module_init_tools, pciutils, smartmontools, x86_energy_perf_policy 3 3 , enableRDW ? false, networkmanager 4 4 }: 5 5 ··· 27 27 buildInputs = [ perl ]; 28 28 29 29 paths = lib.makeSearchPath "bin" 30 - ([ iw rfkill hdparm ethtool inetutils systemd kmod pciutils smartmontools 30 + ([ iw rfkill hdparm ethtool inetutils systemd module_init_tools pciutils smartmontools 31 31 x86_energy_perf_policy 32 32 ] 33 33 ++ lib.optional enableRDW networkmanager