nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 18:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #217024: ruby_3_0: fix build on darwin

Browse Source 
...into staging-next
This commit is contained in:
Vladimír Čunát 2023-02-19 11:18:38 +01:00
commit c9849777e3
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,6 +97,13 @@ let
}).${ver.majMinTiny} }).${ver.majMinTiny}
++ op (lib.versionOlder ver.majMin "3.1") ./do-not-regenerate-revision.h.patch ++ op (lib.versionOlder ver.majMin "3.1") ./do-not-regenerate-revision.h.patch
++ op (atLeast30 && useBaseRuby) ./do-not-update-gems-baseruby.patch ++ op (atLeast30 && useBaseRuby) ./do-not-update-gems-baseruby.patch
++ ops (ver.majMin == "3.0") [
# Ruby 3.0 adds `-fdeclspec` to $CC instead of $CFLAGS. Fixed in later versions.
(fetchpatch {
url = "https://github.com/ruby/ruby/commit/0acc05caf7518cd0d63ab02bfa036455add02346.patch";
sha256 = "sha256-43hI9L6bXfeujgmgKFVmiWhg7OXvshPCCtQ4TxqK1zk=";
})
]
++ ops (!atLeast30 && rubygemsSupport) [ ++ ops (!atLeast30 && rubygemsSupport) [
# We upgrade rubygems to a version that isn't compatible with the # We upgrade rubygems to a version that isn't compatible with the
# ruby 2.7 installer. Backport the upstream fix. # ruby 2.7 installer. Backport the upstream fix.