Merge pull request tweag#4 from Skydio/danny/bazel-tweaks

Move custom code out of nixpkgs subfolder. Wrap nix_cc with macro to use supports_nix constraint.

Author: danny-skydio

defs.bzl

@@ -1,16 +1,20 @@
 load(
-    "//nixpkgs:private/rules.bzl",
+    "//private:rules.bzl",
     _nix_bundleable = "nix_bundleable",
     _nix_cc = "nix_cc",
     _nix_deps_layer = "nix_deps_layer",
     _nix_package_repository = "nix_package_repository",
 )
 load(
-    "//nixpkgs:private/aspects.bzl",
+    "//private:aspects.bzl",
     _nix_deps_aspect = "nix_deps_aspect",
 )
 
-nix_cc = _nix_cc
+_SUPPORT_NIX = "@io_tweag_rules_nixpkgs//nixpkgs/constraints:support_nix"
+
+def nix_cc(target_compatible_with = [], **kwargs):
+    _nix_cc(target_compatible_with = [_SUPPORT_NIX] + target_compatible_with, **kwargs)
+
 nix_package_repository = _nix_package_repository
 nix_bundleable = _nix_bundleable
 nix_deps_aspect = _nix_deps_aspect

private/BUILD.bazel

@@ -1,4 +1,4 @@
-load(":private/providers.bzl", "NixLibraryInfo", "NixPkgsInfo")
+load(":providers.bzl", "NixLibraryInfo", "NixPkgsInfo")
 
 NIX_WRAPPER_TEMPLATE = """
 let

nixpkgs/private/actions.bzl private/actions.bzl

@@ -1,4 +1,4 @@
-load(":private/providers.bzl", "NixDepsInfo", "NixDerivationInfo")
+load(":providers.bzl", "NixDepsInfo", "NixDerivationInfo")
 
 def _nix_deps_aspect_impl(target, ctx):
     store_paths = []

nixpkgs/private/aspects.bzl private/aspects.bzl

@@ -1,12 +1,12 @@
 load(
-    ":private/providers.bzl",
+    ":providers.bzl",
     "NixBuildInfo",
     "NixDepsInfo",
     "NixDerivationInfo",
     "NixLibraryInfo",
     "NixPkgsInfo",
 )
-load(":private/aspects.bzl", "nix_deps_aspect")
+load(":aspects.bzl", "nix_deps_aspect")
 load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cc_toolchain")
 
 def _declare_lib(ctx, lib_name):

nixpkgs/private/providers.bzl private/providers.bzl

@@ -1,4 +1,4 @@
-load("//nixpkgs:private/actions.bzl", "nix_build", "nix_layer", "nix_wrapper")
+load("//private:actions.bzl", "nix_build", "nix_layer", "nix_wrapper")
 
 NixInfo = provider(
     doc = "NixInfo provides information about the nix toolchain",
@@ -40,7 +40,7 @@ def _auto_nix_toolchain(repository_ctx):
     repository_ctx.file(
         "BUILD.bazel",
         content = """
-load("@io_tweag_rules_nixpkgs//nixpkgs:toolchains/nix.bzl", "nix_toolchain")
+load("@io_tweag_rules_nixpkgs//toolchains:nix.bzl", "nix_toolchain")
 load("@io_tweag_rules_nixpkgs//:defs.bzl", "nix_package_repository")
 
 nix_toolchain(