This brings the internal package more in line with how the nixpkgs package is built. It also handles recursive dependencies better than the current system.
