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,83 @@
{ lib, stdenv
, fetchurl
, substituteAll
, openfortivpn
, gettext
, pkg-config
, file
, glib
, gtk3
, networkmanager
, ppp
, libsecret
, withGnome ? true
, gnome3
, fetchpatch
, libnma
}:
stdenv.mkDerivation rec {
pname = "NetworkManager-fortisslvpn";
version = "1.2.10";
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1sw66cxgs4in4cjp1cm95c5ijsk8xbbmq4ykg2jwqwgz6cf2lr3s";
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
inherit openfortivpn;
})
# Don't use etc/dbus-1/system.d
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/merge_requests/11.patch";
sha256 = "0l7l2r1njh62lh2pf497ibf99sgkvjsj58xr76qx3jxgq9zfw6n9";
})
];
nativeBuildInputs = [
gettext
pkg-config
file
];
buildInputs = [
openfortivpn
networkmanager
ppp
glib
] ++ lib.optionals withGnome [
gtk3
libsecret
libnma
];
configureFlags = [
"--with-gnome=${if withGnome then "yes" else "no"}"
"--localstatedir=/var"
"--enable-absolute-paths"
];
installFlags = [
# the installer only creates an empty directory in localstatedir, so
# we can drop it
"localstatedir=."
];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "networkmanager-fortisslvpn";
};
};
meta = with lib; {
description = "NetworkManagers FortiSSL plugin";
inherit (networkmanager.meta) maintainers platforms;
license = licenses.gpl2;
};
}
@@ -0,0 +1,11 @@
--- a/src/nm-fortisslvpn-service.c
+++ b/src/nm-fortisslvpn-service.c
@@ -387,7 +387,7 @@
{
static const char *openfortivpn_binary_paths[] =
{
- "/bin/openfortivpn",
+ "@openfortivpn@/bin/openfortivpn",
"/usr/bin/openfortivpn",
"/usr/local/bin/openfortivpn",
NULL