diff options
| author | Vincent Ambo <mail@tazj.in> | 2021-04-12T20·26+0200 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2021-04-12T21·55+0000 |
| commit | f520bd40cab9bae4f8fa26fe36365a7bf9bccd5a (patch) | |
| tree | 5f116d10e44b7f3616fb63c28e7de03d81869071 /third_party | |
| parent | a5591359702b62e4edd7fdbbd135475037aa6727 (diff) | |
refactor: Replace 'depotPath' with 'depot.path' r/2497
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 <flokli@flokli.de> Change-Id: I2c0db23383fc34f6ca76baaad4cc4af2d9dfae15 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2962 Tested-by: BuildkiteCI Reviewed-by: grfn <grfn@gws.fyi> Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/nix/default.nix | 3 | ||||
| -rw-r--r-- | third_party/nix/test-vm.nix | 2 |
2 files changed, 2 insertions, 3 deletions
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}" ]; }; |