ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

xserver.nix: Check whether Polkit is enabled

Browse Source 
Our X session script requires Polkit because it calls systemd-inhibit.
This commit is contained in:
Eelco Dolstra 2013-01-24 13:06:32 +01:00
parent bd328680ce
commit 8e1f243b30
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/services/x11/xserver.nix
View File

@ -43,6 +43,7 @@ let
pkgs.xorg.fontadobe75dpi
];
# Just enumerate all heads without discarding XRandR output information.
xrandrHeads = let
mkHead = num: output: {
@ -74,6 +75,7 @@ let
monitors = foldl mkMonitor [] xrandrHeads;
in concatMapStrings (getAttr "value") monitors;
configFile = pkgs.stdenv.mkDerivation {
name = "xserver.conf";
@ -107,6 +109,17 @@ let
''; # */
};
checkAgent = mkAssert (!(cfg.startOpenSSHAgent && cfg.startGnuPGAgent))
''
The OpenSSH agent and GnuPG agent cannot be started both.
Choose between `startOpenSSHAgent' and `startGnuPGAgent'.
'';
checkPolkit = mkAssert config.security.polkit.enable
"X11 requires Polkit to be enabled (‘security.polkit.enable = true’).";
in
{
@ -374,13 +387,7 @@ in
###### implementation
config = mkIf cfg.enable
(mkAssert (!(cfg.startOpenSSHAgent && cfg.startGnuPGAgent))
''
The OpenSSH agent and GnuPG agent cannot be started both.
Choose between `startOpenSSHAgent' and `startGnuPGAgent'.
''
{
config = mkIf cfg.enable (checkAgent (checkPolkit {
boot.extraModulePackages =
optional (elem "nvidia" driverNames) kernelPackages.nvidia_x11 ++
@ -601,6 +608,6 @@ in
${xrandrMonitorSections}
'';
});
}));
}