Revert "Merge pull request #11826 from DeterminateSystems/revert-11804"

This reverts commit aeffdeffc8, reversing
changes made to 723fdeb4f1.

tests/functional/ca/config.nix

@@ -0,0 +1,2 @@
+# Shim to get generated file
+import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/ca/config.nix"

tests/functional/ca/content-addressed.nix

@@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/ca/config.nix";
+with import ./config.nix;
 
 let mkCADerivation = args: mkDerivation ({
     __contentAddressed = true;

tests/functional/ca/local.mk

@@ -1,29 +0,0 @@
-ca-tests := \
-  $(d)/build-with-garbage-path.sh \
-  $(d)/build.sh \
-  $(d)/build-cache.sh \
-  $(d)/concurrent-builds.sh \
-  $(d)/derivation-json.sh \
-  $(d)/duplicate-realisation-in-closure.sh \
-  $(d)/eval-store.sh \
-  $(d)/gc.sh \
-  $(d)/import-from-derivation.sh \
-  $(d)/new-build-cmd.sh \
-  $(d)/nix-copy.sh \
-  $(d)/nix-run.sh \
-  $(d)/nix-shell.sh \
-  $(d)/post-hook.sh \
-  $(d)/recursive.sh \
-  $(d)/repl.sh \
-  $(d)/selfref-gc.sh \
-  $(d)/signatures.sh \
-  $(d)/substitute.sh \
-  $(d)/why-depends.sh
-
-install-tests-groups += ca
-
-clean-files += \
-  $(d)/config.nix
-
-test-deps += \
-  tests/functional/ca/config.nix

tests/functional/ca/nix-run.sh

@@ -6,7 +6,4 @@ flakeDir="$TEST_HOME/flake"
 mkdir -p "${flakeDir}"
 cp flake.nix "${_NIX_TEST_BUILD_DIR}/ca/config.nix" content-addressed.nix "${flakeDir}"
 
-# `config.nix` cannot be gotten via build dir / env var (runs afoul pure eval). Instead get from flake.
-removeBuildDirRef "$flakeDir"/*.nix
-
 nix run --no-write-lock-file "path:${flakeDir}#runnable"

tests/functional/ca/nondeterministic.nix

@@ -1,4 +1,4 @@
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/ca/config.nix";
+with import ./config.nix;
 
 let mkCADerivation = args: mkDerivation ({
     __contentAddressed = true;

tests/functional/ca/racy.nix

@@ -2,7 +2,7 @@
 # build it at once.
 
 
-with import "${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/ca/config.nix";
+with import ./config.nix;
 
 mkDerivation {
   name = "simple";