This incorporates the btrfs fix, so remove that patch. Also, I will test that this builds after committing, and fix it if it fails svn path=/nixpkgs/trunk/; revision=33885