diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2023-06-13 05:53:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-13 05:53:18 +0200 |
| commit | 202850e1a11a939364cef0f326cb1352b3f2d8cd (patch) | |
| tree | af4a08bc6c607844141618d8faa2dcf8a2240241 /pkgs/development/ruby-modules | |
| parent | 14e5e0f7f7f6f2ff7e54cf5238ea821679a6e0ba (diff) | |
| parent | 671243193cf629a2472f881776db3429d16c536f (diff) | |
| download | nixpkgs-202850e1a11a939364cef0f326cb1352b3f2d8cd.tar nixpkgs-202850e1a11a939364cef0f326cb1352b3f2d8cd.tar.gz nixpkgs-202850e1a11a939364cef0f326cb1352b3f2d8cd.tar.bz2 nixpkgs-202850e1a11a939364cef0f326cb1352b3f2d8cd.tar.lz nixpkgs-202850e1a11a939364cef0f326cb1352b3f2d8cd.tar.xz nixpkgs-202850e1a11a939364cef0f326cb1352b3f2d8cd.tar.zst nixpkgs-202850e1a11a939364cef0f326cb1352b3f2d8cd.zip | |
Merge pull request #237187 from marsam/update-jruby
jruby: 9.3.9.0 -> 9.4.3.0
Diffstat (limited to 'pkgs/development/ruby-modules')
| -rw-r--r-- | pkgs/development/ruby-modules/gem/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index b8d4df1128a..7105663413a 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -136,7 +136,7 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { # As of ruby 3.0, ruby headers require -fdeclspec when building with clang # Introduced in https://github.com/ruby/ruby/commit/0958e19ffb047781fe1506760c7cbd8d7fe74e57 - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isClang && lib.versionAtLeast ruby.version.major "3") [ + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (ruby.rubyEngine == "ruby" && stdenv.cc.isClang && lib.versionAtLeast ruby.version.major "3") [ "-fdeclspec" ]); |