Skip to content

Commit a902277

Browse files
committed
ruby*: use matching openssl version for each release
1 parent 5cb3e07 commit a902277

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

pkgs/development/interpreters/ruby/default.nix

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{ stdenv, buildPackages, lib
22
, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
3-
, zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, jemalloc, autoreconfHook, bison
3+
, zlib, gdbm, ncurses, readline, groff, libyaml, libffi, jemalloc, autoreconfHook, bison
44
, autoconf, libiconv, libobjc, libunwind, Foundation
55
, buildEnv, bundler, bundix
66
, makeWrapper, buildRubyGem, defaultGemConfig, removeReferencesTo
7+
, openssl, openssl_1_1
78
} @ args:
89

910
let
@@ -26,7 +27,7 @@ let
2627
, useRailsExpress ? true
2728
, rubygemsSupport ? true
2829
, zlib, zlibSupport ? true
29-
, openssl, opensslSupport ? true
30+
, openssl, openssl_1_1, opensslSupport ? true
3031
, gdbm, gdbmSupport ? true
3132
, ncurses, readline, cursesSupport ? true
3233
, groff, docSupport ? true
@@ -75,7 +76,8 @@ let
7576
++ (op fiddleSupport libffi)
7677
++ (ops cursesSupport [ ncurses readline ])
7778
++ (op zlibSupport zlib)
78-
++ (op opensslSupport openssl)
79+
++ (op (lib.versionOlder ver.majMin "3.0" && opensslSupport) openssl_1_1)
80+
++ (op (atLeast30 && opensslSupport) openssl_1_1)
7981
++ (op gdbmSupport gdbm)
8082
++ (op yamlSupport libyaml)
8183
# Looks like ruby fails to build on darwin without readline even if curses

0 commit comments

Comments
 (0)