make{,Binary}Wrapper: some cleanups#172366

thiagokokada merged 8 commits intoNixOS:stagingNixOS/nixpkgs:stagingfrom

ncfavier:wrappers-cleanupncfavier/nixpkgs:wrappers-cleanupCopy head branch name to clipboard