Fix wacom and cherry-pick acpid fix by surr

See commits' comments and https://github.com/NixOS/nixos/pull/63