mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-03 19:43:30 +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.
32 lines
867 B
Diff
32 lines
867 B
Diff
--- a/properties/nm-vpnc-editor-plugin.c
|
|
+++ b/properties/nm-vpnc-editor-plugin.c
|
|
@@ -161,7 +161,7 @@
|
|
GError *error = NULL;
|
|
|
|
const char *decrypt_possible_paths[] = {
|
|
- "/usr/lib/vpnc/cisco-decrypt",
|
|
+ "@vpnc@/bin/cisco-decrypt",
|
|
"/usr/bin/cisco-decrypt",
|
|
NULL
|
|
};
|
|
--- a/src/nm-vpnc-service.c
|
|
+++ b/src/nm-vpnc-service.c
|
|
@@ -610,7 +610,7 @@
|
|
find_vpnc (void)
|
|
{
|
|
static const char *vpnc_paths[] = {
|
|
- "/usr/sbin/vpnc",
|
|
+ "@vpnc@/bin/vpnc",
|
|
"/sbin/vpnc",
|
|
"/usr/local/sbin/vpnc",
|
|
NULL
|
|
@@ -1308,7 +1308,7 @@
|
|
_LOGD (" vpnc interactive mode is %s", interactive_available ? "enabled" : "disabled");
|
|
_LOGD (" uses%s --bus-name \"%s\"", bus_name_free ? "" : " default", bus_name);
|
|
|
|
- if (system ("/sbin/modprobe tun") == -1)
|
|
+ if (system ("@kmod@/bin/modprobe tun") == -1)
|
|
exit (EXIT_FAILURE);
|
|
|
|
plugin = nm_vpnc_plugin_new (bus_name);
|