From 5f50a5563f6b37f95cec060ebbf4e2f99b3f7ac4 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Mon, 30 Dec 2024 21:43:39 -0500 Subject: [PATCH] ruby: Drop cargo, it's not used by yjit - https://github.com/ruby/ruby/blob/0b559eab0447905a784092824e5ea0999018cd01/yjit/yjit.mk#L22-L27 Only `$RUSTC`, which desugars to `rustc` by default, is used for yjit. Note that the plumbing for cargo does exist, but is used for development purposes only. Signed-off-by: Samuel Dionne-Riel (cherry picked from commit 90e5b96d7fc14cd8b4e290769f4d188e75329a32) --- pkgs/development/interpreters/ruby/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 33eaaf90ede2..8cd7959fd6d5 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -20,7 +20,6 @@ buildEnv, bundler, bundix, - cargo, rustPlatform, rustc, makeBinaryWrapper, @@ -104,7 +103,6 @@ let # - In $out/lib/libruby.so and/or $out/lib/libruby.dylib removeReferencesTo, jitSupport ? yjitSupport, - cargo, rustPlatform, rustc, yjitSupport ? yjitSupported, @@ -154,7 +152,6 @@ let ]) ++ ops yjitSupport [ rustPlatform.cargoSetupHook - cargo rustc ] ++ op useBaseRuby baseRuby;