summary refs log tree commit diff
path: root/pkgs/tools/typesetting/asciidoctor
diff options
context:
space:
mode:
authorMichael Peyton Jones <me@michaelpj.com>2019-07-04 13:50:56 +0100
committerMichael Peyton Jones <me@michaelpj.com>2019-07-04 13:51:08 +0100
commit855936370c2d44d966c0d1248dff97096cd9be31 (patch)
tree33e39bcff2c7f49f4c3015be1f64485e2634ea54 /pkgs/tools/typesetting/asciidoctor
parent42249205fe851c860d21399dd647352d66819380 (diff)
downloadnixpkgs-855936370c2d44d966c0d1248dff97096cd9be31.tar
nixpkgs-855936370c2d44d966c0d1248dff97096cd9be31.tar.gz
nixpkgs-855936370c2d44d966c0d1248dff97096cd9be31.tar.bz2
nixpkgs-855936370c2d44d966c0d1248dff97096cd9be31.tar.lz
nixpkgs-855936370c2d44d966c0d1248dff97096cd9be31.tar.xz
nixpkgs-855936370c2d44d966c0d1248dff97096cd9be31.tar.zst
nixpkgs-855936370c2d44d966c0d1248dff97096cd9be31.zip
asciidoctor: address review comments
Diffstat (limited to 'pkgs/tools/typesetting/asciidoctor')
-rw-r--r--pkgs/tools/typesetting/asciidoctor/default.nix9
1 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix
index 1a34aa78f6d..0704600916a 100644
--- a/pkgs/tools/typesetting/asciidoctor/default.nix
+++ b/pkgs/tools/typesetting/asciidoctor/default.nix
@@ -1,4 +1,4 @@
-{ lib, bundlerApp, mkShell, bundix, defaultGemConfig }:
+{ lib, bundlerApp, mkShell, bundix }:
 
 let app = bundlerApp {
     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 { 
-    buildInputs = 
-      app.gems.mathematical.buildInputs ++ 
-      app.gems.nokogiri.buildInputs ++ 
-      [ bundix ]; 
+    inputsFrom = lib.mapAttrs app.gems;
+    buildInputs = [ bundix ]; 
   };
 in app.overrideAttrs (attrs: { passthru = attrs.passthru // { updateShell = shell; }; })