From 855936370c2d44d966c0d1248dff97096cd9be31 Mon Sep 17 00:00:00 2001
From: Michael Peyton Jones <me@michaelpj.com>
Date: Thu, 4 Jul 2019 13:50:56 +0100
Subject: asciidoctor: address review comments

---
 pkgs/tools/typesetting/asciidoctor/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'pkgs/tools/typesetting/asciidoctor')

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; }; })
-- 
cgit 1.4.1