MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #25925 from selaux/networkmanager_fortisslvpn

Browse source 
networkmanager_fortisslvpn: init at 1.2.4
This commit is contained in:
Jörg Thalheim 2017-05-20 09:18:22 +01:00 committed by GitHub
commit 7c9437104a
5 changed files with 47 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/services/networking/networkmanager.nix
View file

@ -124,7 +124,7 @@ in {
type = types.attrsOf types.package;
default = { inherit networkmanager modemmanager wpa_supplicant
networkmanager_openvpn networkmanager_vpnc
networkmanager_openconnect
networkmanager_openconnect networkmanager_fortisslvpn
networkmanager_pptp networkmanager_l2tp; };
internal = true;
};
@ -222,6 +222,9 @@ in {
{ source = "${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name";
target = "NetworkManager/VPN/nm-openconnect-service.name";
}
{ source = "${networkmanager_fortisslvpn}/etc/NetworkManager/VPN/nm-fortisslvpn-service.name";
target = "NetworkManager/VPN/nm-fortisslvpn-service.name";
}
{ source = "${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name";
target = "NetworkManager/VPN/nm-pptp-service.name";
}

2
nixos/modules/services/x11/desktop-managers/gnome3.nix
View file

@ -186,7 +186,7 @@ in {
networking.networkmanager.basePackages =
{ inherit (pkgs) networkmanager modemmanager wpa_supplicant;
inherit (gnome3) networkmanager_openvpn networkmanager_vpnc
networkmanager_openconnect networkmanager_pptp
networkmanager_openconnect networkmanager_fortisslvpn networkmanager_pptp
networkmanager_l2tp; };
# Needed for themes and backgrounds

4
pkgs/desktops/gnome-3/3.22/default.nix
View file

@ -212,6 +212,10 @@ let
inherit gnome3;
};
networkmanager_fortisslvpn = pkgs.networkmanager_fortisslvpn.override {
inherit gnome3;
};
networkmanager_l2tp = pkgs.networkmanager_l2tp.override {
inherit gnome3;
};

36
pkgs/tools/networking/network-manager/fortisslvpn.nix Normal file
View file

@ -0,0 +1,36 @@
{ stdenv, fetchurl, openfortivpn, automake, autoconf, libtool, intltool, pkgconfig,
networkmanager, ppp, lib, libsecret, withGnome ? true, gnome3, procps, kmod }:
stdenv.mkDerivation rec {
name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
pname = "NetworkManager-fortisslvpn";
major = "1.2";
version = "${major}.4";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz";
sha256 = "0wsbj5lvf9l1w8k5nmaqnzmldilh482bn4z4k8a3wnm62xfxgscr";
};
buildInputs = [ openfortivpn networkmanager ppp libtool libsecret ]
++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring gnome3.gconf gnome3.networkmanagerapplet ];
nativeBuildInputs = [ automake autoconf intltool pkgconfig ];
configureFlags = [
"${if withGnome then "--with-gnome" else "--without-gnome"}"
"--disable-static"
"--localstatedir=/tmp"
];
preConfigure = ''
substituteInPlace "src/nm-fortisslvpn-service.c" \
--replace "/bin/openfortivpn" "${openfortivpn}/bin/openfortivpn"
'';
meta = {
description = "NetworkManager's FortiSSL plugin";
inherit (networkmanager.meta) maintainers platforms;
};
}

2
pkgs/top-level/all-packages.nix
View file

@ -3209,6 +3209,8 @@ with pkgs;
networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { };
networkmanager_fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn.nix { };
networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan.nix { };
networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager-applet { };