networkmanager-sstp: init at unstable-2020-04-20

This commit is contained in:
Florian Klink 2020-10-15 22:55:18 +02:00
parent 24c9b05ac5
commit 72cd3086cc
3 changed files with 70 additions and 0 deletions

View file

@ -15,6 +15,7 @@ let
networkmanager-openconnect
networkmanager-openvpn
networkmanager-vpnc
networkmanager-sstp
] ++ optional (!delegateWireless && !enableIwd) wpa_supplicant;
delegateWireless = config.networking.wireless.enable == true && cfg.unmanaged != [];
@ -386,6 +387,9 @@ in {
"NetworkManager/VPN/nm-iodine-service.name".source =
"${networkmanager-iodine}/lib/NetworkManager/VPN/nm-iodine-service.name";
"NetworkManager/VPN/nm-sstp-service.name".source =
"${networkmanager-sstp}/lib/NetworkManager/VPN/nm-sstp-service.name";
}
// optionalAttrs (cfg.appendNameservers != [] || cfg.insertNameservers != [])
{

View file

@ -0,0 +1,64 @@
{ stdenv
, autoreconfHook
, fetchFromGitHub
, fetchpatch
, file
, glib
, gnome3
, gtk3
, intltool
, libnma
, libsecret
, networkmanager
, pkgconfig
, ppp
, sstp
, substituteAll
, withGnome ? true }:
let
pname = "NetworkManager-sstp";
version = "unstable-2020-04-20";
in stdenv.mkDerivation {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
src = fetchFromGitHub {
owner = "enaess";
repo = "network-manager-sstp";
rev = "735d8ca078f933e085029f60a737e3cf1d8c29a8";
sha256 = "0aahfhy2ch951kzj6gnd8p8hv2s5yd5y10wrmj68djhnx2ml8cd3";
};
buildInputs = [ sstp networkmanager glib ppp ]
++ stdenv.lib.optionals withGnome [ gtk3 libsecret libnma ];
nativeBuildInputs = [ file intltool autoreconfHook pkgconfig ];
postPatch = ''
sed -i 's#/sbin/pppd#${ppp}/bin/pppd#' src/nm-sstp-service.c
sed -i 's#/sbin/sstpc#${sstp}/bin/sstpc#' src/nm-sstp-service.c
'';
# glib-2.62 deprecations
NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";
preConfigure = "intltoolize";
configureFlags = [
"--without-libnm-glib"
"--with-gnome=${if withGnome then "yes" else "no"}"
"--enable-absolute-paths"
];
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "networkmanager-sstp";
};
};
meta = with stdenv.lib; {
description = "NetworkManager's sstp plugin";
inherit (networkmanager.meta) maintainers platforms;
license = licenses.gpl2Plus;
};
}

View file

@ -5714,6 +5714,8 @@ in
networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan { };
networkmanager-sstp = callPackage ../tools/networking/network-manager/sstp { };
networkmanagerapplet = callPackage ../tools/networking/network-manager/applet { };
libnma = callPackage ../tools/networking/network-manager/libnma { };