bsdiff: adopt and clean up

Bonus: simpler build, and should fix the build of bsdiff for Darwin
(patch taken from homebrew).

Signed-off-by: Austin Seipp <aseipp@pobox.com>
Merge branch 'bsdiff' of git://github.com/thoughtpolice/nixpkgs

bsdiff: adopt and clean up