asciidoctor: address review comments

This commit is contained in:
Michael Peyton Jones
2019-07-04 13:51:08 +01:00
parent 42249205fe
commit 855936370c
@@ -1,4 +1,4 @@
{ lib, bundlerApp, mkShell, bundix, defaultGemConfig }: { lib, bundlerApp, mkShell, bundix }:
let app = bundlerApp { let app = bundlerApp {
pname = "asciidoctor"; pname = "asciidoctor";
@@ -20,10 +20,9 @@ let app = bundlerApp {
}; };
}; };
# Can't be defined directly in the passthru, since app.gems isn't defined at that point.
shell = mkShell { shell = mkShell {
buildInputs = inputsFrom = lib.mapAttrs app.gems;
app.gems.mathematical.buildInputs ++ buildInputs = [ bundix ];
app.gems.nokogiri.buildInputs ++
[ bundix ];
}; };
in app.overrideAttrs (attrs: { passthru = attrs.passthru // { updateShell = shell; }; }) in app.overrideAttrs (attrs: { passthru = attrs.passthru // { updateShell = shell; }; })