diff options
| -rw-r--r-- | tvix/default.nix | 79 | ||||
| -rw-r--r-- | tvix/utils.nix | 77 |
2 files changed, 78 insertions, 78 deletions
diff --git a/tvix/default.nix b/tvix/default.nix index bfa02e72d216..8d393dce4b86 100644 --- a/tvix/default.nix +++ b/tvix/default.nix @@ -2,86 +2,9 @@ { pkgs, lib, depot, ... }: let - # crate override for crates that need protobuf - protobufDep = prev: (prev.nativeBuildInputs or [ ]) ++ [ pkgs.buildPackages.protobuf ]; - - # On Darwin, some crates producing binaries need to be able to link against security. - darwinDeps = lib.optionals pkgs.stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ - Security - SystemConfiguration - ]); - # Load the crate2nix crate tree. crates = pkgs.callPackage ./Cargo.nix { - defaultCrateOverrides = pkgs.defaultCrateOverrides // { - nix-compat = prev: { - src = depot.tvix.utils.filterRustCrateSrc rec { - root = prev.src.origSrc; - extraFileset = (root + "/testdata"); - }; - }; - tvix-build = prev: { - src = depot.tvix.utils.filterRustCrateSrc rec { - root = prev.src.origSrc; - extraFileset = (lib.fileset.fileFilter (f: f.hasExt "proto") root); - }; - PROTO_ROOT = depot.tvix.build.protos.protos; - nativeBuildInputs = protobufDep prev; - buildInputs = darwinDeps; - }; - - tvix-castore = prev: { - src = depot.tvix.utils.filterRustCrateSrc rec { - root = prev.src.origSrc; - extraFileset = (lib.fileset.fileFilter (f: f.hasExt "proto") root); - }; - PROTO_ROOT = depot.tvix.castore.protos.protos; - nativeBuildInputs = protobufDep prev; - }; - - tvix-cli = prev: { - src = depot.tvix.utils.filterRustCrateSrc { root = prev.src.origSrc; }; - buildInputs = prev.buildInputs or [ ] ++ darwinDeps; - }; - - tvix-store = prev: { - src = depot.tvix.utils.filterRustCrateSrc rec { - root = prev.src.origSrc; - extraFileset = (lib.fileset.fileFilter (f: f.hasExt "proto") root); - }; - PROTO_ROOT = depot.tvix.store.protos.protos; - nativeBuildInputs = protobufDep prev; - # fuse-backend-rs uses DiskArbitration framework to handle mount/unmount on Darwin - buildInputs = prev.buildInputs or [ ] - ++ darwinDeps - ++ lib.optional pkgs.stdenv.isDarwin pkgs.buildPackages.darwin.apple_sdk.frameworks.DiskArbitration; - }; - - tvix-eval-builtin-macros = prev: { - src = depot.tvix.utils.filterRustCrateSrc { root = prev.src.origSrc; }; - }; - - tvix-eval = prev: { - src = depot.tvix.utils.filterRustCrateSrc rec { - root = prev.src.origSrc; - extraFileset = (root + "/proptest-regressions"); - }; - }; - - tvix-glue = prev: { - src = depot.tvix.utils.filterRustCrateSrc { - root = prev.src.origSrc; - }; - }; - - tvix-serde = prev: { - src = depot.tvix.utils.filterRustCrateSrc { root = prev.src.origSrc; }; - }; - - tvix-tracing = prev: { - src = depot.tvix.utils.filterRustCrateSrc { root = prev.src.origSrc; }; - }; - }; + defaultCrateOverrides = depot.tvix.utils.defaultCrateOverridesForPkgs pkgs; }; # Cargo dependencies to be used with nixpkgs rustPlatform functions. diff --git a/tvix/utils.nix b/tvix/utils.nix index 0bb9323d684d..7adf8fe99733 100644 --- a/tvix/utils.nix +++ b/tvix/utils.nix @@ -41,4 +41,81 @@ (lib.fileset.maybeMissing (root + "/Cargo.lock")) ] ++ lib.optional (extraFileset != null) extraFileset)); }; + + # A function which takes a pkgs instance and returns an overriden defaultCrateOverrides with support for tvix crates. + # This can be used throughout the rest of the repo. + defaultCrateOverridesForPkgs = pkgs: + let + commonDarwinDeps = with pkgs.darwin.apple_sdk.frameworks; [ + Security + SystemConfiguration + ]; + in + pkgs.defaultCrateOverrides // { + nix-compat = prev: { + src = depot.tvix.utils.filterRustCrateSrc rec { + root = prev.src.origSrc; + extraFileset = root + "/testdata"; + }; + }; + tvix-build = prev: { + src = depot.tvix.utils.filterRustCrateSrc rec { + root = prev.src.origSrc; + extraFileset = lib.fileset.fileFilter (f: f.hasExt "proto") root; + }; + PROTO_ROOT = depot.tvix.build.protos.protos; + nativeBuildInputs = [ pkgs.protobuf ]; + buildInputs = lib.optional pkgs.stdenv.isDarwin commonDarwinDeps; + }; + + tvix-castore = prev: { + src = depot.tvix.utils.filterRustCrateSrc rec { + root = prev.src.origSrc; + extraFileset = lib.fileset.fileFilter (f: f.hasExt "proto") root; + }; + PROTO_ROOT = depot.tvix.castore.protos.protos; + nativeBuildInputs = [ pkgs.protobuf ]; + }; + + tvix-cli = prev: { + src = depot.tvix.utils.filterRustCrateSrc { root = prev.src.origSrc; }; + buildInputs = lib.optional pkgs.stdenv.isDarwin commonDarwinDeps; + }; + + tvix-store = prev: { + src = depot.tvix.utils.filterRustCrateSrc rec { + root = prev.src.origSrc; + extraFileset = lib.fileset.fileFilter (f: f.hasExt "proto") root; + }; + PROTO_ROOT = depot.tvix.store.protos.protos; + nativeBuildInputs = [ pkgs.protobuf ]; + # fuse-backend-rs uses DiskArbitration framework to handle mount/unmount on Darwin + buildInputs = lib.optional pkgs.stdenv.isDarwin (commonDarwinDeps ++ pkgs.darwin.apple_sdk.frameworks.DiskArbitration); + }; + + tvix-eval-builtin-macros = prev: { + src = depot.tvix.utils.filterRustCrateSrc { root = prev.src.origSrc; }; + }; + + tvix-eval = prev: { + src = depot.tvix.utils.filterRustCrateSrc rec { + root = prev.src.origSrc; + extraFileset = root + "/proptest-regressions"; + }; + }; + + tvix-glue = prev: { + src = depot.tvix.utils.filterRustCrateSrc { + root = prev.src.origSrc; + }; + }; + + tvix-serde = prev: { + src = depot.tvix.utils.filterRustCrateSrc { root = prev.src.origSrc; }; + }; + + tvix-tracing = prev: { + src = depot.tvix.utils.filterRustCrateSrc { root = prev.src.origSrc; }; + }; + }; } |