nix-functional-tests: move env variables into env for structuredAttrs (#508281) (a3a6c03f) · Commits · nix / nixpkgs

pkgs/tools/package-management/nix/modular/tests/functional/package.nix

+65 −67

Original line number	Diff line number	Diff line
		@@ -28,9 +28,7 @@
		test-daemon ? null,
		}:

		mkMesonDerivation (
		finalAttrs:
		{
		mkMesonDerivation (finalAttrs: {
		inherit pname version;

		workDir = ./.;
		@@ -62,6 +60,11 @@ mkMesonDerivation (
		nix-expr
		];

		env = lib.optionalAttrs (test-daemon != null) {
		NIX_DAEMON_PACKAGE = test-daemon;
		_NIX_TEST_CLIENT_VERSION = nix-cli.version;
		};

		preConfigure =
		# TEMP hack for Meson before make is gone, where
		# `src/nix-functional-tests` is during the transition a symlink and
		@@ -92,9 +95,4 @@ mkMesonDerivation (
		platforms = lib.platforms.unix;
		};

		}
		// lib.optionalAttrs (test-daemon != null) {
		NIX_DAEMON_PACKAGE = test-daemon;
		_NIX_TEST_CLIENT_VERSION = nix-cli.version;
		}
		)
		})