Nexus/nexus
Nexus/nexus
Watch
3
6
Fork
You've already forked nexus
 8
Code Issues 22 Pull requests Releases 10 Activity Actions

fix dbus config for e2e headless

Browse source
This commit is contained in:
Henry Hiles 2026-11-12 21:02:52 -05:00
commit 5146c30bdb
Signed by: Henry-Hiles
SSH key fingerprint: SHA256:VKQUdS31Q90KvX7EkKMHMBpUspcmItAh86a+v7PGiIs
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
linux/nix/default.nix
View file

@ -65,6 +65,9 @@
apps = apps =
let let
buildEnv = import ./build_env.nix { inherit pkgs lib; }; buildEnv = import ./build_env.nix { inherit pkgs lib; };
testEnv = buildEnv.env // {
DBUS_SESSION_CONFIG = "${pkgs.dbus}/share/dbus-1/session.conf";
};
e2e = pkgs.writeShellApplication { e2e = pkgs.writeShellApplication {
name = "nexus-e2e"; name = "nexus-e2e";
runtimeInputs = runtimeInputs =
@ -75,7 +78,7 @@
curl curl
dbus dbus
]); ]);
runtimeEnv = buildEnv.env; runtimeEnv = testEnv;
text = builtins.readFile ./e2e.sh; text = builtins.readFile ./e2e.sh;
}; };
screenshots = pkgs.writeShellApplication { screenshots = pkgs.writeShellApplication {
@ -87,7 +90,7 @@
oxipng oxipng
pngquant pngquant
]); ]);
runtimeEnv = buildEnv.env; runtimeEnv = testEnv;
text = builtins.readFile ./screenshots.sh; text = builtins.readFile ./screenshots.sh;
}; };

2
linux/nix/e2e.sh
View file

@ -69,7 +69,7 @@ for file in "${files[@]}"; do
name="$(basename "$file" .dart)" name="$(basename "$file" .dart)"
mkdir -p "$work/$name/data" "$work/$name/cache" mkdir -p "$work/$name/data" "$work/$name/cache"
XDG_DATA_HOME="$work/$name/data" XDG_CACHE_HOME="$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 \ flutter test "$file" -d linux \
--dart-define="NEXUS_E2E_HOMESERVER=$homeserver" "${flutter_args[@]}" || --dart-define="NEXUS_E2E_HOMESERVER=$homeserver" "${flutter_args[@]}" ||
status=$? status=$?

2
linux/nix/screenshots.sh
View file

@ -12,7 +12,7 @@ GOCACHE="$(go env GOCACHE)"
export GOCACHE export GOCACHE
XDG_DATA_HOME="$work/data" XDG_CACHE_HOME="$work/cache" \ 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 \ flutter test integration_test/screenshots/screenshots_test.dart -d linux \
--dart-define="SCREENSHOTS_DIR=$work/out" "$@" --dart-define="SCREENSHOTS_DIR=$work/out" "$@"