diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0c7df42..7fa5e87 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -350,6 +350,7 @@ jobs: test -x result/bin/gpgui head -n1 result/bin/gpclient | grep '^#!' grep -q '/run/wrappers/bin/pkexec' result/bin/gpclient + grep -q 'gpservice_public=.*/bin/gpservice' result/bin/gpclient ! grep -R '/usr/bin/gp' result/share diff --git a/flake.nix b/flake.nix index 0e6317a..4d4e94d 100644 --- a/flake.nix +++ b/flake.nix @@ -245,7 +245,7 @@ set -eu gpclient_fhs='${prebuiltCommands.gpclient}/bin/gpclient' - gpservice_fhs='${prebuiltCommands.gpservice}/bin/gpservice' + gpservice_public='$out/bin/gpservice' if [ "''${1:-}" = "launch-gui" ]; then shift @@ -289,9 +289,9 @@ set +e if [ -n "$minimized" ]; then - "$pkexec_bin" --user root "$gpservice_fhs" --minimized --env-file "$env_file" 2>"$log_file" + "$pkexec_bin" --user root "$gpservice_public" --minimized --env-file "$env_file" 2>"$log_file" else - "$pkexec_bin" --user root "$gpservice_fhs" --env-file "$env_file" 2>"$log_file" + "$pkexec_bin" --user root "$gpservice_public" --env-file "$env_file" 2>"$log_file" fi status=$? set -e