nixos/brightnessctl: Remove the module
Due to the support of the systemd-logind API the udev rules aren't required anymore which renders this module useless [0]. Note: brightnessctl should now require a working D-Bus setup and a valid local logind session for this to work. [0]: https://github.com/NixOS/nixpkgs/pull/79663
This commit is contained in:
parent
cf5dd2623b
commit
5282bc9a74
|
@ -1,31 +0,0 @@
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
let
|
|
||||||
cfg = config.hardware.brightnessctl;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
|
|
||||||
options = {
|
|
||||||
|
|
||||||
hardware.brightnessctl = {
|
|
||||||
|
|
||||||
enable = mkOption {
|
|
||||||
default = false;
|
|
||||||
type = types.bool;
|
|
||||||
description = ''
|
|
||||||
Enable brightnessctl in userspace.
|
|
||||||
This will allow brightness control from users in the video group.
|
|
||||||
'';
|
|
||||||
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
services.udev.packages = with pkgs; [ brightnessctl ];
|
|
||||||
environment.systemPackages = with pkgs; [ brightnessctl ];
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
|
@ -41,7 +41,6 @@
|
||||||
./hardware/acpilight.nix
|
./hardware/acpilight.nix
|
||||||
./hardware/all-firmware.nix
|
./hardware/all-firmware.nix
|
||||||
./hardware/bladeRF.nix
|
./hardware/bladeRF.nix
|
||||||
./hardware/brightnessctl.nix
|
|
||||||
./hardware/brillo.nix
|
./hardware/brillo.nix
|
||||||
./hardware/ckb-next.nix
|
./hardware/ckb-next.nix
|
||||||
./hardware/cpu/amd-microcode.nix
|
./hardware/cpu/amd-microcode.nix
|
||||||
|
|
|
@ -42,6 +42,12 @@ with lib;
|
||||||
instead, or any other display manager in NixOS as they all support auto-login.
|
instead, or any other display manager in NixOS as they all support auto-login.
|
||||||
'')
|
'')
|
||||||
(mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead")
|
(mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead")
|
||||||
|
(mkRemovedOptionModule ["hardware" "brightnessctl" ] ''
|
||||||
|
The brightnessctl module was removed because newer versions of
|
||||||
|
brightnessctl don't require the udev rules anymore (they can use the
|
||||||
|
systemd-logind API). Instead of using the module you can now
|
||||||
|
simply add the brightnessctl package to environment.systemPackages.
|
||||||
|
'')
|
||||||
|
|
||||||
# Do NOT add any option renames here, see top of the file
|
# Do NOT add any option renames here, see top of the file
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchFromGitHub, coreutils, pkg-config, systemd }:
|
{ stdenv, fetchFromGitHub, pkg-config, systemd }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "brightnessctl";
|
pname = "brightnessctl";
|
||||||
|
@ -13,12 +13,6 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
makeFlags = [ "PREFIX=" "DESTDIR=$(out)" "ENABLE_SYSTEMD=1" ];
|
makeFlags = [ "PREFIX=" "DESTDIR=$(out)" "ENABLE_SYSTEMD=1" ];
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
substituteInPlace 90-brightnessctl.rules --replace /bin/ ${coreutils}/bin/
|
|
||||||
# For backward compatibility with the NixOS module / udev approach:
|
|
||||||
substituteInPlace Makefile --replace "INSTALL_UDEV_RULES=0" "INSTALL_UDEV_RULES=1"
|
|
||||||
'';
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
buildInputs = [ systemd ];
|
buildInputs = [ systemd ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user