public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bundlerApp: Set up passthru properly

Browse Source 
The manual documents both bundlerEnv and bundlerApp as providing `env`
and `wrappedRuby` attributes on the resulting derivations. However only
bundlerEnv actually had these attributes. Update bundlerApp to provide
the same passthru that bundlerEnv does.
This commit is contained in:
Lily Ballard 2019-06-10 14:13:04 -07:00
parent 6c7586228c
commit 39eb49c9f0
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/ruby-modules/bundler-app/default.nix
View File

@ -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 ''