diff options
Diffstat (limited to 'nixpkgs/pkgs/servers/http/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch')
| -rw-r--r-- | nixpkgs/pkgs/servers/http/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/servers/http/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch b/nixpkgs/pkgs/servers/http/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch new file mode 100644 index 000000000000..5a24e7e4a90d --- /dev/null +++ b/nixpkgs/pkgs/servers/http/envoy/0003-nixpkgs-use-system-C-C-toolchains.patch @@ -0,0 +1,29 @@ +From 6175deb13a2df8bd25a56021ba8754e4be445219 Mon Sep 17 00:00:00 2001 +From: Luke Granger-Brown <git@lukegb.com> +Date: Fri, 13 Oct 2023 21:42:51 +0000 +Subject: [PATCH 3/3] nixpkgs: use system C/C++ toolchains + +--- + 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 afa04ef5c0..a5ffaf4ff3 100644 +--- a/bazel/dependency_imports.bzl ++++ b/bazel/dependency_imports.bzl +@@ -24,7 +24,11 @@ JQ_VERSION = "1.6" + 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) + gazelle_dependencies(go_sdk = "go_sdk") +-- +2.42.0 + |