pyrox.dev
networkmanager-l2tp: 1.2.8 → 1.2.10
+17
-21
pkgs/tools/networking/network-manager/l2tp/default.nix
+17
-21
pkgs/tools/networking/network-manager/l2tp/default.nix
···
1
-
{ stdenv, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig
1
+
{ stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkgconfig
2
2
, networkmanager, ppp, xl2tpd, strongswan, libsecret
3
3
, withGnome ? true, gnome3, networkmanagerapplet }:
4
4
5
5
stdenv.mkDerivation rec {
6
-
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
7
-
pname = "NetworkManager-l2tp";
8
-
version = "1.2.8";
6
+
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
7
+
pname = "NetworkManager-l2tp";
8
+
version = "1.2.10";
9
9
10
10
src = fetchFromGitHub {
11
-
owner = "nm-l2tp";
12
-
repo = "network-manager-l2tp";
13
-
rev = "${version}";
14
-
sha256 = "110157dpamgr7r5kb8aidi0a2ap9z2m52bff94fb4nhxacz69yv8";
11
+
owner = "nm-l2tp";
12
+
repo = "network-manager-l2tp";
13
+
rev = "${version}";
14
+
sha256 = "1vm004nj2n5abpywr7ji6r28scf7xs45zw4rqrm8jn7mysf96h0x";
15
15
};
16
16
17
-
buildInputs = [ networkmanager ppp libsecret ]
18
-
++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome-keyring networkmanagerapplet ];
19
-
20
-
nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ];
17
+
patches = [
18
+
(substituteAll {
19
+
src = ./fix-paths.patch;
20
+
inherit strongswan xl2tpd;
21
+
})
22
+
];
21
23
22
-
postPatch = ''
23
-
sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-l2tp-service.c
24
+
buildInputs = [ networkmanager ppp ]
25
+
++ stdenv.lib.optionals withGnome [ gnome3.gtk libsecret networkmanagerapplet ];
24
26
25
-
substituteInPlace ./Makefile.am \
26
-
--replace '$(sysconfdir)/dbus-1/system.d' "$out/etc/dbus-1/system.d"
27
-
28
-
substituteInPlace ./src/nm-l2tp-service.c \
29
-
--replace /sbin/ipsec ${strongswan}/bin/ipsec \
30
-
--replace /sbin/xl2tpd ${xl2tpd}/bin/xl2tpd
31
-
'';
27
+
nativeBuildInputs = [ autoreconfHook libtool intltool pkgconfig ];
32
28
33
29
preConfigure = ''
34
30
intltoolize -f
+20
pkgs/tools/networking/network-manager/l2tp/fix-paths.patch
+20
pkgs/tools/networking/network-manager/l2tp/fix-paths.patch
···
1
+
--- a/src/nm-l2tp-service.c
2
+
+++ b/src/nm-l2tp-service.c
3
+
@@ -480,7 +480,7 @@
4
+
{
5
+
static const char *ipsec_binary_paths[] =
6
+
{
7
+
- "/sbin/ipsec",
8
+
+ "@strongswan@/bin/ipsec",
9
+
"/usr/sbin/ipsec",
10
+
"/usr/local/sbin/ipsec",
11
+
"/sbin/strongswan",
12
+
@@ -505,7 +505,7 @@
13
+
{
14
+
static const char *l2tp_binary_paths[] =
15
+
{
16
+
- "/sbin/xl2tpd",
17
+
+ "@xl2tpd@/bin/xl2tpd",
18
+
"/usr/sbin/xl2tpd",
19
+
"/usr/local/sbin/xl2tpd",
20
+
NULL