Done mostly without any verification. I didn't bother with libc}/include, as the path is still correct.
svn path=/nixpkgs/trunk/; revision=27739
svn path=/nixpkgs/trunk/; revision=27719