The latest nixpkgs `master` has all fixes I had in my nixpkgs commit 50677e464359947f2a71cfd497c4022e3cdf8c7d. So I'd like to just switch to a nixpkgs master commit.