From 0d8d1b67588db0ad446a66ebdf179ec4c6b445ad Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 26 Nov 2023 23:27:55 +0100 Subject: [PATCH] ruby: drop openssl_1_1 references --- pkgs/development/interpreters/ruby/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 8eb19835828b..cc540c7c560f 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -4,7 +4,7 @@ , autoconf, libiconv, libobjc, libunwind, Foundation , buildEnv, bundler, bundix, cargo, rustPlatform, rustc , makeBinaryWrapper, buildRubyGem, defaultGemConfig, removeReferencesTo -, openssl, openssl_1_1 +, openssl , linuxPackages, libsystemtap } @ args: @@ -30,7 +30,7 @@ let , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , rubygemsSupport ? true , zlib, zlibSupport ? true - , openssl, openssl_1_1, opensslSupport ? true + , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true , ncurses, readline, cursesSupport ? true , groff, docSupport ? true @@ -85,7 +85,6 @@ let ++ (ops cursesSupport [ ncurses readline ]) ++ (op zlibSupport zlib) ++ (op (atLeast30 && opensslSupport) openssl) - ++ (op (!atLeast30 && opensslSupport) openssl_1_1) ++ (op gdbmSupport gdbm) ++ (op yamlSupport libyaml) # Looks like ruby fails to build on darwin without readline even if curses