mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 07:23:20 +00:00
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
From 3ecb08a7603a07310d1a38c0f47bc54bbe1f11c8 Mon Sep 17 00:00:00 2001
|
|
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
|
|
Date: Mon, 22 Apr 2024 11:59:22 +0200
|
|
Subject: [PATCH] nixpkgs: use system C/C++ toolchains
|
|
|
|
Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
|
|
---
|
|
bazel/dependency_imports.bzl | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/bazel/dependency_imports.bzl b/bazel/dependency_imports.bzl
|
|
index addee4f6af..dc1967e43b 100644
|
|
--- a/bazel/dependency_imports.bzl
|
|
+++ b/bazel/dependency_imports.bzl
|
|
@@ -26,7 +26,11 @@ JQ_VERSION = "1.7"
|
|
YQ_VERSION = "4.24.4"
|
|
|
|
def envoy_dependency_imports(go_version = GO_VERSION, jq_version = JQ_VERSION, yq_version = YQ_VERSION):
|
|
- rules_foreign_cc_dependencies()
|
|
+ rules_foreign_cc_dependencies(
|
|
+ register_default_tools=False, # no prebuilt toolchains
|
|
+ register_built_tools=False, # nor from source
|
|
+ register_preinstalled_tools=True, # use host tools (default)
|
|
+ )
|
|
go_rules_dependencies()
|
|
go_register_toolchains(go_version)
|
|
if go_version != "host":
|