diff --git a/linux/nix/default.nix b/linux/nix/default.nix index 7e69e46..8f09dbc 100644 --- a/linux/nix/default.nix +++ b/linux/nix/default.nix @@ -65,6 +65,9 @@ apps = let buildEnv = import ./build_env.nix { inherit pkgs lib; }; + testEnv = buildEnv.env // { + DBUS_SESSION_CONFIG = "${pkgs.dbus}/share/dbus-1/session.conf"; + }; e2e = pkgs.writeShellApplication { name = "nexus-e2e"; runtimeInputs = @@ -75,7 +78,7 @@ curl dbus ]); - runtimeEnv = buildEnv.env; + runtimeEnv = testEnv; text = builtins.readFile ./e2e.sh; }; screenshots = pkgs.writeShellApplication { @@ -87,7 +90,7 @@ oxipng pngquant ]); - runtimeEnv = buildEnv.env; + runtimeEnv = testEnv; text = builtins.readFile ./screenshots.sh; }; diff --git a/linux/nix/e2e.sh b/linux/nix/e2e.sh index 6cc9f09..585712b 100755 --- a/linux/nix/e2e.sh +++ b/linux/nix/e2e.sh @@ -69,7 +69,7 @@ for file in "${files[@]}"; do name="$(basename "$file" .dart)" mkdir -p "$work/$name/data" "$work/$name/cache" XDG_DATA_HOME="$work/$name/data" XDG_CACHE_HOME="$work/$name/cache" \ - dbus-run-session -- \ + dbus-run-session --config-file="$DBUS_SESSION_CONFIG" -- \ flutter test "$file" -d linux \ --dart-define="NEXUS_E2E_HOMESERVER=$homeserver" "${flutter_args[@]}" || status=$? diff --git a/linux/nix/screenshots.sh b/linux/nix/screenshots.sh index cdf18ff..f3dced6 100644 --- a/linux/nix/screenshots.sh +++ b/linux/nix/screenshots.sh @@ -12,7 +12,7 @@ GOCACHE="$(go env GOCACHE)" export GOCACHE XDG_DATA_HOME="$work/data" XDG_CACHE_HOME="$work/cache" \ - dbus-run-session -- \ + dbus-run-session --config-file="$DBUS_SESSION_CONFIG" -- \ flutter test integration_test/screenshots/screenshots_test.dart -d linux \ --dart-define="SCREENSHOTS_DIR=$work/out" "$@"