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

asciidoctor: address review comments

Browse Source
This commit is contained in:
Michael Peyton Jones 2019-07-04 13:50:56 +01:00
parent 42249205fe
commit 855936370c
No known key found for this signature in database
GPG Key ID: 86A43C24A728F66D
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/tools/typesetting/asciidoctor/default.nix
View File

@ -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; }; })