From 0481a33d214b3129970d0951e2fe82548c4d3d04 Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Mon, 20 Feb 2017 21:03:44 -0800
Subject: [PATCH] Simplifying interface on gemset.nix slightly.

`usesGemspec` no longer required to trigger the "copy everything into
gemfile-and-lock" behavior. If the mainGem is referred to by path,
that's sufficient.
---
 .../ruby-modules/bundler-env/default.nix       | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundler-env/default.nix b/pkgs/development/ruby-modules/bundler-env/default.nix
index ba9ea5f3fa80..794dd11665d1 100644
--- a/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -76,16 +76,14 @@ let
     if hasBundler then gems.bundler
     else defs.bundler.override (attrs: { inherit ruby; });
 
-  pathDerivation = {
-    usesGemspec ? false, ...
-  }@attrs:
+  pathDerivation = { gemName, version, path, ...  }:
     let
       res = {
-          inherit usesGemspec;
           type = "derivation";
-          name = attrs.gemName;
-          version = attrs.version;
-          outPath = attrs.path;
+          bundledByPath = true;
+          name = gemName;
+          version = version;
+          outPath = path;
           outputs = [ "out" ];
           out = res;
           outputName = "out";
@@ -105,10 +103,10 @@ let
 
   gems = lib.flip lib.mapAttrs configuredGemset (name: attrs: buildGem name attrs);
 
-  maybeCopyAll = main: if main == null then "" else copyIfUseGemspec main;
+  maybeCopyAll = main: if main == null then "" else copyIfBundledByPath main;
 
-  copyIfUseGemspec = { usesGemspec ? false, ...}@main:
-  (if usesGemspec then ''
+  copyIfBundledByPath = { bundledByPath ? false, ...}@main:
+  (if bundledByPath then ''
   cp -a ${gemdir}/* $out/
   '' else ""
   );