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.
21 lines
527 B
Diff
21 lines
527 B
Diff
--- a/src/nm-openconnect-service.c
|
|
+++ b/src/nm-openconnect-service.c
|
|
@@ -60,7 +60,7 @@
|
|
|
|
static const char *openconnect_binary_paths[] =
|
|
{
|
|
- "/usr/bin/openconnect",
|
|
+ "@openconnect@/bin/openconnect",
|
|
"/usr/sbin/openconnect",
|
|
"/usr/local/bin/openconnect",
|
|
"/usr/local/sbin/openconnect",
|
|
@@ -734,7 +734,7 @@
|
|
|
|
_LOGD ("nm-openconnect-service (version " DIST_VERSION ") starting...");
|
|
|
|
- if (system ("/sbin/modprobe tun") == -1)
|
|
+ if (system ("@kmod@/bin/modprobe tun") == -1)
|
|
exit (EXIT_FAILURE);
|
|
|
|
if (bus_name)
|