b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #213317 from kurnevsky/throttled

Browse source 
throttled: fix after recent update
This commit is contained in:
Martin Weinelt 2023-02-01 01:37:20 +00:00 committed by GitHub
parent 25a9e5aef8 8542aa185d
commit a85007b253
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/hardware/throttled.nix
View file

@ -20,7 +20,7 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
systemd.packages = [ pkgs.throttled ]; systemd.packages = [ pkgs.throttled ];
# The upstream package has this in Install, but that's not enough, see the NixOS manual # The upstream package has this in Install, but that's not enough, see the NixOS manual
systemd.services.lenovo_fix.wantedBy = [ "multi-user.target" ]; systemd.services.throttled.wantedBy = [ "multi-user.target" ];
environment.etc."throttled.conf".source = environment.etc."throttled.conf".source =
if cfg.extraConfig != "" if cfg.extraConfig != ""

8
pkgs/tools/system/throttled/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, python3Packages }: { lib, stdenv, fetchFromGitHub, python3Packages, pciutils }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "throttled"; pname = "throttled";
@ -20,7 +20,11 @@ stdenv.mkDerivation rec {
]; ];
# The upstream unit both assumes the install location, and tries to run in a virtualenv # The upstream unit both assumes the install location, and tries to run in a virtualenv
postPatch = ''sed -e 's|ExecStart=.*|ExecStart=${placeholder "out"}/bin/throttled.py|' -i systemd/throttled.service''; postPatch = ''
sed -e 's|ExecStart=.*|ExecStart=${placeholder "out"}/bin/throttled.py|' -i systemd/throttled.service
substituteInPlace throttled.py --replace "'setpci'" "'${pciutils}/bin/setpci'"
'';
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall