From f520bd40cab9bae4f8fa26fe36365a7bf9bccd5a Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 12 Apr 2021 22:26:55 +0200 Subject: refactor: Replace 'depotPath' with 'depot.path' Instead of having two ways of accessing the path to the depot (one of which was stuttering, depot.depotPath) we settle on only one: depot.path. This was mostly used for NixOS module imports. Co-Authored-By: Florian Klink Change-Id: I2c0db23383fc34f6ca76baaad4cc4af2d9dfae15 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2962 Tested-by: BuildkiteCI Reviewed-by: grfn Reviewed-by: sterni --- third_party/nix/default.nix | 3 +-- third_party/nix/test-vm.nix | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'third_party/nix') diff --git a/third_party/nix/default.nix b/third_party/nix/default.nix index 2a66925f00ea..df6a6da72ff7 100644 --- a/third_party/nix/default.nix +++ b/third_party/nix/default.nix @@ -3,7 +3,6 @@ args@{ , pkgs ? depot.third_party.nixpkgs , lib , buildType ? "release" -, depotPath ? ../.. , ... }: @@ -198,7 +197,7 @@ in lib.fix (self: pkgs.llvmPackages.libcxxStdenv.mkDerivation { installCheckInputs = up.installCheckInputs ++ [run_clang_tidy]; shellHook = '' - export NIX_DATA_DIR="${toString depotPath}/third_party" + export NIX_DATA_DIR="${toString depot.path}/third_party" export NIX_TEST_VAR=foo ''; }); diff --git a/third_party/nix/test-vm.nix b/third_party/nix/test-vm.nix index 550537679c49..e5f8690fcb2d 100644 --- a/third_party/nix/test-vm.nix +++ b/third_party/nix/test-vm.nix @@ -11,7 +11,7 @@ let virtualisation.qemu.options = [ "-nographic" "-curses" ]; nix.nixPath = [ - "depot=${depot.depotPath}" + "depot=${depot.path}" ]; }; -- cgit 1.4.1