From 0c4d157720be59f9ceba80f7d161ceccf11f39c9 Mon Sep 17 00:00:00 2001
From: Alex Rodionov <p0deje@gmail.com>
Date: Wed, 17 Apr 2024 18:44:40 -0700
Subject: [PATCH] [bazel] Attempt to fix zstd compilation

---
 MODULE.bazel | 21 +++++++++++++++++++++
 WORKSPACE    | 27 ---------------------------
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index 89508a3ec7cb1..5667410b14ef0 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -19,6 +19,7 @@ bazel_dep(name = "rules_pkg", version = "0.9.1")
 bazel_dep(name = "rules_python", version = "0.31.0")
 bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
 bazel_dep(name = "rules_ruby", version = "0.8.1")
+bazel_dep(name = "rules_rust", version = "0.42.1")
 
 linter = use_extension("@apple_rules_lint//lint:extensions.bzl", "linter")
 linter.configure(
@@ -321,6 +322,26 @@ use_repo(ruby, "bundle", "ruby", "ruby_toolchains")
 
 register_toolchains("@ruby_toolchains//:all")
 
+rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
+rust.toolchain()
+use_repo(rust, "rust_toolchains")
+
+register_toolchains("@rust_toolchains//:all")
+
+crate = use_extension("@rules_rust//crate_universe:extension.bzl", "crate")
+crate.from_cargo(
+    name = "crates",
+    cargo_lockfile = "//rust:Cargo.lock",
+    manifests = ["//rust:Cargo.toml"],
+)
+use_repo(crate, "crates")
+
+crate.annotation(
+    crate = "zstd-sys",
+    # This build script is naughty and tries to depend on system zlib or build it from source (with gcc!)
+    gen_build_script = "off",
+)
+
 selenium_manager_artifacts = use_extension("//common:selenium_manager.bzl", "selenium_manager_artifacts")
 use_repo(
     selenium_manager_artifacts,
diff --git a/WORKSPACE b/WORKSPACE
index faf12b2a8a4ea..aea396c789541 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -32,30 +32,3 @@ load("@io_bazel_rules_closure//closure:repositories.bzl", "rules_closure_depende
 rules_closure_dependencies()
 
 rules_closure_toolchains()
-
-# rules_rust
-
-http_archive(
-    name = "rules_rust",
-    integrity = "sha256-JLN47ZcAbx9wEr5Jiib4HduZATGLiDgK7oUi/fvotzU=",
-    urls = ["https://github.com/bazelbuild/rules_rust/releases/download/0.42.1/rules_rust-v0.42.1.tar.gz"],
-)
-
-load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains")
-
-rules_rust_dependencies()
-
-rust_register_toolchains()
-
-load("@rules_rust//crate_universe:defs.bzl", "crates_repository")
-
-crates_repository(
-    name = "crates",
-    cargo_lockfile = "//rust:Cargo.lock",
-    lockfile = "//rust:Cargo.Bazel.lock",
-    manifests = ["//rust:Cargo.toml"],
-)
-
-load("@crates//:defs.bzl", "crate_repositories")
-
-crate_repositories()