diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-05-19 15:15:07 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-06-18 16:09:35 +0000 |
| commit | 828bd4e8ddcbcd354ddfd99f55af69ee8ff5d9e7 (patch) | |
| tree | 3c3d36ff8d607a29f4050d875f403dab4790ae0a /nixpkgs/pkgs | |
| parent | e0a1cce870c07475b0524a525149f96d964930c9 (diff) | |
| download | nixlib-828bd4e8ddcbcd354ddfd99f55af69ee8ff5d9e7.tar nixlib-828bd4e8ddcbcd354ddfd99f55af69ee8ff5d9e7.tar.gz nixlib-828bd4e8ddcbcd354ddfd99f55af69ee8ff5d9e7.tar.bz2 nixlib-828bd4e8ddcbcd354ddfd99f55af69ee8ff5d9e7.tar.lz nixlib-828bd4e8ddcbcd354ddfd99f55af69ee8ff5d9e7.tar.xz nixlib-828bd4e8ddcbcd354ddfd99f55af69ee8ff5d9e7.tar.zst nixlib-828bd4e8ddcbcd354ddfd99f55af69ee8ff5d9e7.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 'nixpkgs/pkgs')
| -rw-r--r-- | nixpkgs/pkgs/development/interpreters/ruby/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/nixpkgs/pkgs/development/interpreters/ruby/default.nix index ae4aa146ee52..2342b693aef6 100644 --- a/nixpkgs/pkgs/development/interpreters/ruby/default.nix +++ b/nixpkgs/pkgs/development/interpreters/ruby/default.nix @@ -96,7 +96,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 '' + opString isRuby21 '' rm "$sourceRoot/enc/unicode/name2ctype.h" ''; @@ -168,12 +170,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 |