alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #17470 from layus/synaptics-conflict

Browse source 
Warn for conflict between synaptics and libinput
This commit is contained in:
Joachim F 2016-08-05 19:26:07 +02:00 committed by GitHub
parent fae6264d3a 0f0be5e498
commit f044035a9e
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/services/x11/hardware/libinput.nix
View file

@ -227,6 +227,14 @@ in {
EndSection
'';
assertions = [
# already present in synaptics.nix
/* {
assertion = !config.services.xserver.synaptics.enable;
message = "Synaptics and libinput are incompatible, you cannot enable both (in services.xserver).";
} */
];
};
}

7
nixos/modules/services/x11/hardware/synaptics.nix
View file

@ -205,6 +205,13 @@ in {
EndSection
'';
assertions = [
{
assertion = !config.services.xserver.libinput.enable;
message = "Synaptics and libinput are incompatible, you cannot enable both (in services.xserver).";
}
];
};
}