mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-24 05:44:13 +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.
23 lines
1.1 KiB
Diff
23 lines
1.1 KiB
Diff
diff --git a/shared/utils.c b/shared/utils.c
|
|
index 453e277..28716a5 100644
|
|
--- a/shared/utils.c
|
|
+++ b/shared/utils.c
|
|
@@ -39,7 +39,7 @@ check_ipsec_daemon(const char *path)
|
|
const char *
|
|
nm_find_ipsec(void)
|
|
{
|
|
- static const char *ipsec_binary_paths[] = {"/usr/bin/ipsec",
|
|
+ static const char *ipsec_binary_paths[] = {"@strongswan@/bin/ipsec",
|
|
"/sbin/ipsec",
|
|
"/usr/sbin/ipsec",
|
|
"/usr/local/sbin/ipsec",
|
|
@@ -70,7 +70,7 @@ nm_find_l2tpd(NML2tpL2tpDaemon *l2tp_daemon)
|
|
"/usr/local/sbin/kl2tpd",
|
|
NULL};
|
|
|
|
- static const char *xl2tp_binary_paths[] = {"/usr/bin/xl2tpd",
|
|
+ static const char *xl2tp_binary_paths[] = {"@xl2tpd@/bin/xl2tpd",
|
|
"/sbin/xl2tpd",
|
|
"/usr/sbin/xl2tpd",
|
|
"/usr/local/sbin/xl2tpd",
|