Nix wrappers: improvements

[timokau]

Without having read the details, this is probably relevant: Declarative wrappers