This also modifies how the patches are applied, since nixpkgs does not apply any patches any more.
This also reorganises the other patch I apply.