diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-05-19 15:15:07 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-31 11:33:03 +0000 |
| commit | 01c4c15ef55845de1052ed915b4f05b7b7059a75 (patch) | |
| tree | 50b0487c9eec0dc8a275aa08a6bcb8cf2c7738a5 /pkgs/development/interpreters/ruby | |
| parent | 5b0851028fbde2be9f0fc6db009ddb265404c27a (diff) | |
| download | nixpkgs-01c4c15ef55845de1052ed915b4f05b7b7059a75.tar nixpkgs-01c4c15ef55845de1052ed915b4f05b7b7059a75.tar.gz nixpkgs-01c4c15ef55845de1052ed915b4f05b7b7059a75.tar.bz2 nixpkgs-01c4c15ef55845de1052ed915b4f05b7b7059a75.tar.lz nixpkgs-01c4c15ef55845de1052ed915b4f05b7b7059a75.tar.xz nixpkgs-01c4c15ef55845de1052ed915b4f05b7b7059a75.tar.zst nixpkgs-01c4c15ef55845de1052ed915b4f05b7b7059a75.zip | |
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.
Diffstat (limited to 'pkgs/development/interpreters/ruby')
| -rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 5908ecac269..54c1e70d553 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 |