networkmanager: fix path and pname

This commit is contained in:
Maxine Aubrey
2021-03-15 20:20:41 +01:00
parent b8a4051536
commit 17177b551f
26 changed files with 16 additions and 16 deletions
@@ -0,0 +1,51 @@
{ lib, stdenv, substituteAll, fetchFromGitHub, autoreconfHook, libtool, intltool, pkg-config
, file, findutils
, gtk3, networkmanager, ppp, xl2tpd, strongswan, libsecret
, withGnome ? true, libnma }:
stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
pname = "NetworkManager-l2tp";
version = "1.2.12";
src = fetchFromGitHub {
owner = "nm-l2tp";
repo = "network-manager-l2tp";
rev = version;
sha256 = "0cq07kvlm98s8a7l4a3zmqnif8x3307kv7n645zx3f1r7x72b8m4";
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
inherit strongswan xl2tpd;
})
];
buildInputs = [ networkmanager ppp ]
++ lib.optionals withGnome [ gtk3 libsecret libnma ];
nativeBuildInputs = [ autoreconfHook libtool intltool pkg-config file findutils ];
preConfigure = ''
intltoolize -f
'';
configureFlags = [
"--without-libnm-glib"
"--with-gnome=${if withGnome then "yes" else "no"}"
"--localstatedir=/var"
"--sysconfdir=$(out)/etc"
"--enable-absolute-paths"
];
enableParallelBuilding = true;
meta = with lib; {
description = "L2TP plugin for NetworkManager";
inherit (networkmanager.meta) platforms;
homepage = "https://github.com/nm-l2tp/network-manager-l2tp";
license = licenses.gpl2;
maintainers = with maintainers; [ abbradar obadz ];
};
}
@@ -0,0 +1,22 @@
diff --git a/shared/utils.c b/shared/utils.c
index c978a1f..d2c36cd 100644
--- a/shared/utils.c
+++ b/shared/utils.c
@@ -52,7 +52,7 @@ nm_find_ipsec (void)
{
static const char *ipsec_binary_paths[] =
{
- "/sbin/ipsec",
+ "@strongswan@/bin/ipsec",
"/usr/sbin/ipsec",
"/usr/local/sbin/ipsec",
"/sbin/strongswan",
@@ -77,7 +77,7 @@ nm_find_l2tpd (void)
{
static const char *l2tp_binary_paths[] =
{
- "/sbin/xl2tpd",
+ "@xl2tpd@/bin/xl2tpd",
"/usr/sbin/xl2tpd",
"/usr/local/sbin/xl2tpd",
NULL