pyrox.dev
networkmanager-l2tp: 1.2.12 → 1.20.4
- Adds support for GNOME 42.
- Allows using go-l2tp instead of xl2tpd but we do not have the former packaged.
- Removes some old cruft, allowing us to simplify the expression.
https://github.com/nm-l2tp/NetworkManager-l2tp/blob/1.20.4/NEWS
+11
-14
pkgs/tools/networking/networkmanager/l2tp/default.nix
+11
-14
pkgs/tools/networking/networkmanager/l2tp/default.nix
···
3
3
, substituteAll
4
4
, fetchFromGitHub
5
5
, autoreconfHook
6
-
, libtool
7
-
, intltool
8
6
, pkg-config
9
-
, file
10
7
, gtk3
8
+
, gtk4
11
9
, networkmanager
12
10
, ppp
13
11
, xl2tpd
···
15
13
, libsecret
16
14
, withGnome ? true
17
15
, libnma
16
+
, libnma-gtk4
18
17
, glib
18
+
, openssl
19
+
, nss
19
20
}:
20
21
21
22
stdenv.mkDerivation rec {
22
23
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
23
24
pname = "NetworkManager-l2tp";
24
-
version = "1.2.12";
25
+
version = "1.20.4";
25
26
26
27
src = fetchFromGitHub {
27
28
owner = "nm-l2tp";
28
29
repo = "network-manager-l2tp";
29
30
rev = version;
30
-
sha256 = "0cq07kvlm98s8a7l4a3zmqnif8x3307kv7n645zx3f1r7x72b8m4";
31
+
sha256 = "VoqPjMQILBYemRE5VD/XwhWi9zL9QxxHZJ2JKtGglFo=";
31
32
};
32
33
33
34
patches = [
···
39
40
40
41
nativeBuildInputs = [
41
42
autoreconfHook
42
-
libtool
43
-
intltool
44
43
pkg-config
45
-
file
46
44
];
47
45
48
46
buildInputs = [
49
47
networkmanager
50
48
ppp
51
49
glib
50
+
openssl
51
+
nss
52
52
] ++ lib.optionals withGnome [
53
53
gtk3
54
+
gtk4
54
55
libsecret
55
56
libnma
57
+
libnma-gtk4
56
58
];
57
59
58
60
configureFlags = [
59
-
"--without-libnm-glib"
60
61
"--with-gnome=${if withGnome then "yes" else "no"}"
62
+
"--with-gtk4=${if withGnome then "yes" else "no"}"
61
63
"--localstatedir=/var"
62
-
"--sysconfdir=$(out)/etc"
63
64
"--enable-absolute-paths"
64
65
];
65
66
66
67
enableParallelBuilding = true;
67
-
68
-
preConfigure = ''
69
-
intltoolize -f
70
-
'';
71
68
72
69
passthru = {
73
70
networkManagerPlugin = "VPN/nm-l2tp-service.name";
+18
-18
pkgs/tools/networking/networkmanager/l2tp/fix-paths.patch
+18
-18
pkgs/tools/networking/networkmanager/l2tp/fix-paths.patch
···
1
1
diff --git a/shared/utils.c b/shared/utils.c
2
-
index c978a1f..d2c36cd 100644
2
+
index 453e277..28716a5 100644
3
3
--- a/shared/utils.c
4
4
+++ b/shared/utils.c
5
-
@@ -52,7 +52,7 @@ nm_find_ipsec (void)
6
-
{
7
-
static const char *ipsec_binary_paths[] =
8
-
{
9
-
- "/sbin/ipsec",
10
-
+ "@strongswan@/bin/ipsec",
11
-
"/usr/sbin/ipsec",
12
-
"/usr/local/sbin/ipsec",
13
-
"/sbin/strongswan",
14
-
@@ -77,7 +77,7 @@ nm_find_l2tpd (void)
5
+
@@ -39,7 +39,7 @@ check_ipsec_daemon(const char *path)
6
+
const char *
7
+
nm_find_ipsec(void)
15
8
{
16
-
static const char *l2tp_binary_paths[] =
17
-
{
18
-
- "/sbin/xl2tpd",
19
-
+ "@xl2tpd@/bin/xl2tpd",
20
-
"/usr/sbin/xl2tpd",
21
-
"/usr/local/sbin/xl2tpd",
22
-
NULL
9
+
- static const char *ipsec_binary_paths[] = {"/usr/bin/ipsec",
10
+
+ static const char *ipsec_binary_paths[] = {"@strongswan@/bin/ipsec",
11
+
"/sbin/ipsec",
12
+
"/usr/sbin/ipsec",
13
+
"/usr/local/sbin/ipsec",
14
+
@@ -70,7 +70,7 @@ nm_find_l2tpd(NML2tpL2tpDaemon *l2tp_daemon)
15
+
"/usr/local/sbin/kl2tpd",
16
+
NULL};
17
+
18
+
- static const char *xl2tp_binary_paths[] = {"/usr/bin/xl2tpd",
19
+
+ static const char *xl2tp_binary_paths[] = {"@xl2tpd@/bin/xl2tpd",
20
+
"/sbin/xl2tpd",
21
+
"/usr/sbin/xl2tpd",
22
+
"/usr/local/sbin/xl2tpd",