This reverts commit 0c262a639e. It broke X tests, though it's not clear why ATM. Discussion: https://github.com/NixOS/nixpkgs/pull/23890#issuecomment-288528788
0c262a639e
crossSystem
*Platform