From 7890e0bd50770655ec26bca22c945063f51d850c Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Wed, 9 Feb 2022 15:33:16 +0100 Subject: [PATCH] Properly generate readme --- README.md | 7 ++----- nixpkgs/nixpkgs.bzl | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 235c281bf..f16fbd7a4 100644 --- a/README.md +++ b/README.md @@ -239,7 +239,7 @@ Dependencies of `nix_file` if any. 
 nixpkgs_cc_configure(name, attribute_path, nix_file, nix_file_content, nix_file_deps, repositories,
                      repository, nixopts, quiet, fail_not_supported, exec_constraints,
-                     target_constraints)
+                     target_constraints, register)
Use a CC toolchain from Nixpkgs. No-op if not a nix-based platform. @@ -441,10 +441,7 @@ default is True

-bool, whether the underlying toolchain should be automatically registered with -register_toolchains. Useful when you need a more advanced -toolchain configuration than the one provided here and do not want this partial -toolchain to be registered as-is. +bool, enabled by default, Whether to register (with `register_toolchains`) the generated toolchain and install it as the default cc_toolchain.

diff --git a/nixpkgs/nixpkgs.bzl b/nixpkgs/nixpkgs.bzl index da76b5375..41ec69f58 100644 --- a/nixpkgs/nixpkgs.bzl +++ b/nixpkgs/nixpkgs.bzl @@ -658,7 +658,7 @@ def nixpkgs_cc_configure( fail_not_supported: bool, Whether to fail if `nix-build` is not available. exec_constraints: Constraints for the execution platform. target_constraints: Constraints for the target platform. - register: Automatically register the created toolchain with the provided *_constraints. Defaults to True. + register: bool, enabled by default, Whether to register (with `register_toolchains`) the generated toolchain and install it as the default cc_toolchain. """ nixopts = list(nixopts)