Merge branch 'xonotic' of github.com:rszibele/nixpkgs into xonotic
Merge branch 'xonotic' of github.com:rszibele/nixpkgs into xonotic
Fixed style.