Merge pull request #62971 from lilyball/bundlerApp-passthru
bundlerApp: Set up passthru properly
This commit is contained in:
commit
4d5c1c8136
|
@ -36,10 +36,15 @@
|
||||||
let
|
let
|
||||||
basicEnv = (callPackage ../bundled-common {}) args;
|
basicEnv = (callPackage ../bundled-common {}) args;
|
||||||
|
|
||||||
cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" ] // {
|
cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" ] // {
|
||||||
inherit preferLocalBuild allowSubstitutes; # pass the defaults
|
inherit preferLocalBuild allowSubstitutes; # pass the defaults
|
||||||
|
|
||||||
buildInputs = buildInputs ++ lib.optional (scripts != []) makeWrapper;
|
buildInputs = buildInputs ++ lib.optional (scripts != []) makeWrapper;
|
||||||
|
|
||||||
|
passthru = basicEnv.passthru // {
|
||||||
|
inherit basicEnv;
|
||||||
|
inherit (basicEnv) env;
|
||||||
|
} // passthru;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
runCommand basicEnv.name cmdArgs ''
|
runCommand basicEnv.name cmdArgs ''
|
||||||
|
|
Loading…
Reference in a new issue