Merge pull request #62971 from lilyball/bundlerApp-passthru

bundlerApp: Set up passthru properly
This commit is contained in:
Matthew Bauer 2019-06-16 15:03:10 -04:00 committed by GitHub
commit 4d5c1c8136
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -36,10 +36,15 @@
let
basicEnv = (callPackage ../bundled-common {}) args;
cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" ] // {
cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" ] // {
inherit preferLocalBuild allowSubstitutes; # pass the defaults
buildInputs = buildInputs ++ lib.optional (scripts != []) makeWrapper;
passthru = basicEnv.passthru // {
inherit basicEnv;
inherit (basicEnv) env;
} // passthru;
};
in
runCommand basicEnv.name cmdArgs ''