Merge pull request #21962 from Mic92/gemdir

bundleEnv: Used gemdir for most applications now

8 files changed, 8 insertions, 24 deletions

diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix
index a8556c4ada12..49425cf65b77 100644
--- a/pkgs/tools/audio/mpdcron/default.nix
+++ b/pkgs/tools/audio/mpdcron/default.nix
@@ -4,9 +4,7 @@
 let
   gemEnv = bundlerEnv {
     name = "mpdcron-bundle";
-    gemfile = ./Gemfile;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
+    gemdir = ./.;
   };
 in stdenv.mkDerivation rec {
   version = "20130809";
diff --git a/pkgs/tools/backup/backup/default.nix b/pkgs/tools/backup/backup/default.nix
index 1890e8121c18..20c96b65a624 100644
--- a/pkgs/tools/backup/backup/default.nix
+++ b/pkgs/tools/backup/backup/default.nix
@@ -4,9 +4,7 @@ bundlerEnv {
   name = "backup_v4";
 
   ruby = ruby_2_1;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  gemdir = ./.;
 
   buildInputs = [ curl ];
 
diff --git a/pkgs/tools/misc/homesick/default.nix b/pkgs/tools/misc/homesick/default.nix
index da167026ade5..81e417ee5abd 100644
--- a/pkgs/tools/misc/homesick/default.nix
+++ b/pkgs/tools/misc/homesick/default.nix
@@ -2,9 +2,7 @@
 bundlerEnv {
   name = "homesick-1.1.3";
 
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  gemdir = ./.;
 
   # Cannot use `wrapProgram` because the the help is aware of the file name.
   postInstall = ''
diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix
index ac4f4524b992..7294c61da8fa 100644
--- a/pkgs/tools/misc/pws/default.nix
+++ b/pkgs/tools/misc/pws/default.nix
@@ -8,9 +8,7 @@ stdenv.mkDerivation rec {
 
     inherit ruby;
 
-    gemfile  = ./Gemfile;
-    lockfile = ./Gemfile.lock;
-    gemset   = ./gemset.nix;
+    gemdir = ./.;
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/tools/networking/maphosts/default.nix
index 08c56574dcf7..3a48814928e5 100644
--- a/pkgs/tools/networking/maphosts/default.nix
+++ b/pkgs/tools/networking/maphosts/default.nix
@@ -6,9 +6,7 @@ stdenv.mkDerivation rec {
   env = bundlerEnv {
     name = "maphosts-gems";
     inherit ruby;
-    gemfile = ./Gemfile;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
+    gemdir = ./.;
   };
 
   phases = ["installPhase"];
diff --git a/pkgs/tools/system/r10k/default.nix b/pkgs/tools/system/r10k/default.nix
index 0695504cc012..95462e2c0035 100644
--- a/pkgs/tools/system/r10k/default.nix
+++ b/pkgs/tools/system/r10k/default.nix
@@ -8,9 +8,7 @@ stdenv.mkDerivation rec {
   env = bundlerEnv {
     name = "${name}-gems";
 
-    gemfile = ./Gemfile;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
+    gemdir = ./.;
     inherit ruby;
   };
 
diff --git a/pkgs/tools/text/reckon/default.nix b/pkgs/tools/text/reckon/default.nix
index b6340fd2df46..de03963a4128 100644
--- a/pkgs/tools/text/reckon/default.nix
+++ b/pkgs/tools/text/reckon/default.nix
@@ -7,9 +7,7 @@ stdenv.mkDerivation rec {
   env = bundlerEnv {
     name = "${name}-gems";
 
-    gemfile = ./Gemfile;
-    lockfile = ./Gemfile.lock;
-    gemset = ./gemset.nix;
+    gemdir = ./.;
   };
 
   phases = [ "installPhase" ];
diff --git a/pkgs/tools/text/ruby-zoom/default.nix b/pkgs/tools/text/ruby-zoom/default.nix
index eb3968a0db93..b939e1500e49 100644
--- a/pkgs/tools/text/ruby-zoom/default.nix
+++ b/pkgs/tools/text/ruby-zoom/default.nix
@@ -4,9 +4,7 @@ bundlerEnv {
   pname = "ruby-zoom";
 
   inherit ruby;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  gemdir = ./.;
 
   meta = with lib; {
     description = "Quickly open CLI search results in your favorite editor!";