mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-28 06:14:26 +03:00
Merge pull request #221721 from K900/remove-plasma-ddc-option
nixos/plasma5: remove supportDDC option
This commit is contained in:
commit
730d115a6e
@ -95,18 +95,6 @@ in
|
|||||||
description = lib.mdDoc "Phonon audio backend to install.";
|
description = lib.mdDoc "Phonon audio backend to install.";
|
||||||
};
|
};
|
||||||
|
|
||||||
supportDDC = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
description = lib.mdDoc ''
|
|
||||||
Support setting monitor brightness via DDC.
|
|
||||||
|
|
||||||
This is not needed for controlling brightness of the internal monitor
|
|
||||||
of a laptop and as it is considered experimental by upstream, it is
|
|
||||||
disabled by default.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
useQtScaling = mkOption {
|
useQtScaling = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
default = false;
|
default = false;
|
||||||
@ -173,6 +161,7 @@ in
|
|||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
(mkRemovedOptionModule [ "services" "xserver" "desktopManager" "plasma5" "enableQt4Support" ] "Phonon no longer supports Qt 4.")
|
(mkRemovedOptionModule [ "services" "xserver" "desktopManager" "plasma5" "enableQt4Support" ] "Phonon no longer supports Qt 4.")
|
||||||
|
(mkRemovedOptionModule [ "services" "xserver" "desktopManager" "plasma5" "supportDDC" ] "DDC/CI is no longer supported upstream.")
|
||||||
(mkRenamedOptionModule [ "services" "xserver" "desktopManager" "kde5" ] [ "services" "xserver" "desktopManager" "plasma5" ])
|
(mkRenamedOptionModule [ "services" "xserver" "desktopManager" "kde5" ] [ "services" "xserver" "desktopManager" "plasma5" ])
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -201,12 +190,6 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# DDC support
|
|
||||||
boot.kernelModules = lib.optional cfg.supportDDC "i2c_dev";
|
|
||||||
services.udev.extraRules = lib.optionalString cfg.supportDDC ''
|
|
||||||
KERNEL=="i2c-[0-9]*", TAG+="uaccess"
|
|
||||||
'';
|
|
||||||
|
|
||||||
environment.systemPackages =
|
environment.systemPackages =
|
||||||
with libsForQt5;
|
with libsForQt5;
|
||||||
with plasma5; with kdeGear; with kdeFrameworks;
|
with plasma5; with kdeGear; with kdeFrameworks;
|
||||||
|
Loading…
Reference in New Issue
Block a user