public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rubygems: fix for Ruby with no openssl

Browse Source 
This fixes the rubyMinimal package.
This commit is contained in:
Alyssa Ross 2019-12-29 18:15:49 +00:00 committed by Frederik Rietdijk
parent 5f2d96ba2e
commit a08e5665fa
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/ruby/default.nix
View File

@ -12,7 +12,7 @@ let
opString = lib.optionalString; opString = lib.optionalString;
patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; };
config = import ./config.nix { inherit fetchFromSavannah; }; 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 # Contains the ruby version heuristics
rubyVersion = import ./ruby-version.nix { inherit lib; }; rubyVersion = import ./ruby-version.nix { inherit lib; };

7
pkgs/development/interpreters/ruby/rubygems/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl }: { stdenv, lib, fetchurl, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rubygems"; name = "rubygems";
@ -13,6 +13,11 @@ stdenv.mkDerivation rec {
./0001-add-post-extract-hook.patch ./0001-add-post-extract-hook.patch
./0002-binaries-with-env-shebang.patch ./0002-binaries-with-env-shebang.patch
./0003-gem-install-default-to-user.patch ./0003-gem-install-default-to-user.patch
(fetchpatch {
url = "https://github.com/rubygems/rubygems/commit/0af4d2d369ff580ef54839ec15a8c7ec419978cb.patch";
sha256 = "13gyfxn4rmxq1dbxq5rzphnhagn8n8kpp8lb9h6h4s9d4zaklax9";
})
]; ];
installPhase = '' installPhase = ''