Fix bootstrap tools

Please also update bootstrap tools after you rebuild them, people are having problems: https://github.com/NixOS/nixpkgs/issues/5335

@edolstra @iElectric