|
12 | 12 | op = lib.optional; |
13 | 13 | ops = lib.optionals; |
14 | 14 | opString = lib.optionalString; |
15 | | - patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; |
16 | 15 | config = import ./config.nix { inherit fetchFromSavannah; }; |
17 | 16 | rubygems = import ./rubygems { inherit stdenv lib fetchurl; }; |
18 | 17 |
|
|
25 | 24 | self = lib.makeOverridable ( |
26 | 25 | { stdenv, buildPackages, lib |
27 | 26 | , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub |
28 | | - , useRailsExpress ? true |
29 | 27 | , rubygemsSupport ? true |
30 | 28 | , zlib, zlibSupport ? true |
31 | 29 | , openssl, openssl_1_1, opensslSupport ? true |
|
51 | 49 | , libiconv, libobjc, libunwind, Foundation |
52 | 50 | , makeBinaryWrapper, buildRubyGem, defaultGemConfig |
53 | 51 | , baseRuby ? buildPackages.ruby_3_1.override { |
54 | | - useRailsExpress = false; |
55 | 52 | docSupport = false; |
56 | 53 | rubygemsSupport = false; |
57 | 54 | } |
58 | | - , useBaseRuby ? stdenv.hostPlatform != stdenv.buildPlatform || useRailsExpress |
| 55 | + , useBaseRuby ? stdenv.hostPlatform != stdenv.buildPlatform |
59 | 56 | }: |
60 | 57 | stdenv.mkDerivation rec { |
61 | 58 | pname = "ruby"; |
|
93 | 90 |
|
94 | 91 | enableParallelBuilding = true; |
95 | 92 |
|
96 | | - patches = |
97 | | - (import ./patchsets.nix { |
98 | | - inherit patchSet useRailsExpress ops fetchpatch; |
99 | | - patchLevel = ver.patchLevel; |
100 | | - }).${ver.majMinTiny} |
101 | | - ++ op (lib.versionOlder ver.majMin "3.1") ./do-not-regenerate-revision.h.patch |
| 93 | + patches = op (lib.versionOlder ver.majMin "3.1") ./do-not-regenerate-revision.h.patch |
102 | 94 | ++ op (atLeast30 && useBaseRuby) ./do-not-update-gems-baseruby.patch |
103 | 95 | ++ ops (ver.majMin == "3.0") [ |
104 | 96 | # Ruby 3.0 adds `-fdeclspec` to $CC instead of $CFLAGS. Fixed in later versions. |
|
0 commit comments