mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-22 21:53:32 +00:00
13cc17cc53
`utils/novnc_proxy` tries to download and run the `websockify` package in the directory where the script is located, which doesn't work because the nix store is read-only. This patches the script to point to nix-installed `websockify`.
14 lines
563 B
Diff
14 lines
563 B
Diff
diff --git a/utils/novnc_proxy b/utils/novnc_proxy
|
|
index 0365c1e..7eba2db 100755
|
|
--- a/utils/novnc_proxy
|
|
+++ b/utils/novnc_proxy
|
|
@@ -167,7 +167,7 @@ if [[ -d ${HERE}/websockify ]]; then
|
|
|
|
echo "Using local websockify at $WEBSOCKIFY"
|
|
else
|
|
- WEBSOCKIFY_FROMSYSTEM=$(which websockify 2>/dev/null)
|
|
+ WEBSOCKIFY_FROMSYSTEM="@websockify@/bin/websockify"
|
|
WEBSOCKIFY_FROMSNAP=${HERE}/../usr/bin/python2-websockify
|
|
[ -f $WEBSOCKIFY_FROMSYSTEM ] && WEBSOCKIFY=$WEBSOCKIFY_FROMSYSTEM
|
|
[ -f $WEBSOCKIFY_FROMSNAP ] && WEBSOCKIFY=$WEBSOCKIFY_FROMSNAP
|