mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2026-11-19 22:46:14 -05:00
fix: substitute NixOS gpservice wrapper path
This commit is contained in:
2 files changed
+4
-1
No files matched your search
@@ -351,6 +351,7 @@ jobs:
|
|||||||
head -n1 result/bin/gpclient | grep '^#!'
|
head -n1 result/bin/gpclient | grep '^#!'
|
||||||
grep -q '/run/wrappers/bin/pkexec' result/bin/gpclient
|
grep -q '/run/wrappers/bin/pkexec' result/bin/gpclient
|
||||||
grep -q 'gpservice_public=.*/bin/gpservice' 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
|
! grep -R '/usr/bin/gp' result/share
|
||||||
|
|
||||||
|
|||||||
@@ -245,7 +245,7 @@
|
|||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
gpclient_fhs='${prebuiltCommands.gpclient}/bin/gpclient'
|
gpclient_fhs='${prebuiltCommands.gpclient}/bin/gpclient'
|
||||||
gpservice_public='$out/bin/gpservice'
|
gpservice_public='@gpservice_public@'
|
||||||
|
|
||||||
if [ "''${1:-}" = "launch-gui" ]; then
|
if [ "''${1:-}" = "launch-gui" ]; then
|
||||||
shift
|
shift
|
||||||
@@ -304,6 +304,8 @@
|
|||||||
|
|
||||||
exec "$gpclient_fhs" "$@"
|
exec "$gpclient_fhs" "$@"
|
||||||
EOF
|
EOF
|
||||||
|
substituteInPlace $out/bin/gpclient \
|
||||||
|
--replace-fail '@gpservice_public@' "$out/bin/gpservice"
|
||||||
chmod +x $out/bin/gpclient
|
chmod +x $out/bin/gpclient
|
||||||
ln -s ${prebuiltCommands.gpservice}/bin/gpservice $out/bin/gpservice
|
ln -s ${prebuiltCommands.gpservice}/bin/gpservice $out/bin/gpservice
|
||||||
ln -s ${prebuiltCommands.gpauth}/bin/gpauth $out/bin/gpauth
|
ln -s ${prebuiltCommands.gpauth}/bin/gpauth $out/bin/gpauth
|
||||||
|
|||||||
Reference in new issue
Block a user