From 01c4c15ef55845de1052ed915b4f05b7b7059a75 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 19 May 2019 15:15:07 +0000
Subject: [PATCH] ruby: replace bundled RubyGems with our RubyGems

This should prevent problems caused by trying to install our own
RubyGems over the top of the one that comes with Ruby.
---
 pkgs/development/interpreters/ruby/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 5908ecac269d..54c1e70d5534 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -93,7 +93,9 @@ let
           }).${ver.majMinTiny};
 
         postUnpack = opString rubygemsSupport ''
-          cp -r ${rubygems} $sourceRoot/rubygems
+          rm -rf $sourceRoot/{lib,test}/rubygems*
+          cp -r ${rubygems}/lib/rubygems* $sourceRoot/lib
+          cp -r ${rubygems}/test/rubygems $sourceRoot/test
         '';
 
         postPatch = if atLeast25 then ''
@@ -158,12 +160,6 @@ let
           EOF
 
           rbConfig=$(find $out/lib/ruby -name rbconfig.rb)
-        '' + opString rubygemsSupport ''
-          # Update rubygems
-          pushd rubygems
-          chmod +w bundler/bundler.gemspec
-          ${buildRuby} setup.rb
-          popd
         '' + opString docSupport ''
           # Prevent the docs from being included in the closure
           sed -i "s|\$(DESTDIR)$devdoc|\$(datarootdir)/\$(RI_BASE_NAME)|" $rbConfig