diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7fa5e87..6b120f9 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -351,6 +351,7 @@ jobs: 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 -q '@gpservice_public@\|\$out/bin/gpservice' result/bin/gpclient ! grep -R '/usr/bin/gp' result/share diff --git a/flake.nix b/flake.nix index 4d4e94d..c845438 100644 --- a/flake.nix +++ b/flake.nix @@ -245,7 +245,7 @@ set -eu gpclient_fhs='${prebuiltCommands.gpclient}/bin/gpclient' - gpservice_public='$out/bin/gpservice' + gpservice_public='@gpservice_public@' if [ "''${1:-}" = "launch-gui" ]; then shift @@ -304,6 +304,8 @@ exec "$gpclient_fhs" "$@" EOF + substituteInPlace $out/bin/gpclient \ + --replace-fail '@gpservice_public@' "$out/bin/gpservice" chmod +x $out/bin/gpclient ln -s ${prebuiltCommands.gpservice}/bin/gpservice $out/bin/gpservice ln -s ${prebuiltCommands.gpauth}/bin/gpauth $out/bin/gpauth