diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-12-29 18:15:49 +0000 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-12-30 16:11:23 +0100 |
| commit | a08e5665fa74e781054ab20abc5d3e70f9dc4d03 (patch) | |
| tree | bceb43d32c5f44316aef9bbd56369d5e3439b480 /pkgs | |
| parent | 5f2d96ba2e8324fa4488fc689f324dbbb25be486 (diff) | |
rubygems: fix for Ruby with no openssl
This fixes the rubyMinimal package.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/ruby/rubygems/default.nix | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index ee9b61259bb0..a87131ff40bb 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -12,7 +12,7 @@ let opString = lib.optionalString; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; config = import ./config.nix { inherit fetchFromSavannah; }; - rubygems = import ./rubygems { inherit stdenv lib fetchurl; }; + rubygems = import ./rubygems { inherit stdenv lib fetchurl fetchpatch; }; # Contains the ruby version heuristics rubyVersion = import ./ruby-version.nix { inherit lib; }; diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index dd1db5a84508..3caac2447e2e 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, fetchpatch }: stdenv.mkDerivation rec { name = "rubygems"; @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { ./0001-add-post-extract-hook.patch ./0002-binaries-with-env-shebang.patch ./0003-gem-install-default-to-user.patch + + (fetchpatch { + url = "https://github.com/rubygems/rubygems/commit/0af4d2d369ff580ef54839ec15a8c7ec419978cb.patch"; + sha256 = "13gyfxn4rmxq1dbxq5rzphnhagn8n8kpp8lb9h6h4s9d4zaklax9"; + }) ]; installPhase = '' |