Revert "Merge branch 'gcc-fix' of git://github.com/ambrop72/nixpkgs"

The patch doesn't apply

This reverts commit 094eea8f6a34296760afb5e11d3b6e08575cb9c0, reversing
changes made to 552d66cd9e94f7e81043aa7becaaaa4b02e7ab6b.