mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-29 09:04:17 +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.
27 lines
969 B
Diff
27 lines
969 B
Diff
Index: strongswan-5.2.1/src/_updown/_updown.in
|
|
===================================================================
|
|
--- strongswan-5.2.1.orig/src/_updown/_updown.in
|
|
+++ strongswan-5.2.1/src/_updown/_updown.in
|
|
@@ -125,7 +125,7 @@
|
|
#
|
|
|
|
# define a minimum PATH environment in case it is not set
|
|
-PATH="/sbin:/bin:/usr/sbin:/usr/bin:@sbindir@"
|
|
+PATH="${PATH:-/sbin:/bin:/usr/sbin:/usr/bin}"
|
|
export PATH
|
|
|
|
# uncomment to log VPN connections
|
|
Index: strongswan-5.2.1/src/libcharon/plugins/updown/updown_listener.c
|
|
===================================================================
|
|
--- strongswan-5.2.1.orig/src/libcharon/plugins/updown/updown_listener.c
|
|
+++ strongswan-5.2.1/src/libcharon/plugins/updown/updown_listener.c
|
|
@@ -240,6 +240,8 @@ static void invoke_once(private_updown_l
|
|
process_t *process;
|
|
char *envp[128] = {};
|
|
|
|
+ push_env(envp, countof(envp), "PATH=%s", getenv("PATH"));
|
|
+
|
|
me = ike_sa->get_my_host(ike_sa);
|
|
other = ike_sa->get_other_host(ike_sa);
|
|
|