mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-10 06:55:10 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
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
|