mirror of
https://github.com/digital-asset/daml.git
synced 2024-09-20 09:17:43 +03:00
1b711d0ac6
* update rules_nixpkgs * Use hermetic nixpkgs cc toolchain CHANGELOG_BEGIN CHANGELOG_END * Work around Bazel's cc toolchain autodetection * Use --crosstool_top for hermetic cc toolchain When using --incompatible_enable_cc_toolchain_resolution instead cc actions still depend on `external/local_config_cc/builtin_include_directory_paths` as well as `external/nixpkgs_cc_toolchain_config/builtin_include_directory_paths`. * override local_config_cc * remove unused attribute * Fix posix toolchain on Windows * nixpkgs cc toolchain not on Windows * Fix nixpkgs cc toolchain on MacOS * nixpkgs cc toolchain uses bin/cc * Use darwin.binutils on MacOS * Remove clang(++) and gcc (g++) symlinks The toolchain only considers `bin/cc` and having the other symlinks around could lead to confusion * Use hermetic toolchain in compatibility workspace * Avoid empty linker flags Co-authored-by: Andreas Herrmann <andreas.herrmann@tweag.io>
23 lines
857 B
Diff
23 lines
857 B
Diff
diff --git a/nixpkgs/nixpkgs.bzl b/nixpkgs/nixpkgs.bzl
|
|
index 2f2c83d..61123c6 100644
|
|
--- a/nixpkgs/nixpkgs.bzl
|
|
+++ b/nixpkgs/nixpkgs.bzl
|
|
@@ -156,7 +156,7 @@ def _nixpkgs_package_impl(repository_ctx):
|
|
"The NIX_PATH environment variable is not inherited."
|
|
)
|
|
|
|
- expr_args = []
|
|
+ expr_args = ["--option", "http2", "false"]
|
|
if repository_ctx.attr.nix_file and repository_ctx.attr.nix_file_content:
|
|
fail("Specify one of 'nix_file' or 'nix_file_content', but not both.")
|
|
elif repository_ctx.attr.nix_file:
|
|
@@ -186,6 +186,8 @@ def _nixpkgs_package_impl(repository_ctx):
|
|
"bazel-support/nix-out-link",
|
|
])
|
|
|
|
+ expr_args.extend(["--option", "http2", "false"])
|
|
+
|
|
if repository_ctx.attr.expand_location:
|
|
expr_args.extend([
|
|
_expand_location(repository_ctx, opt, nix_file_deps, "nixopts")
|