Merge pull request #32216 from LumiGuide/networkmanager-strongswan
networkmanager_strongswan: fix package
This commit is contained in:
commit
90accc093e
|
@ -241,6 +241,19 @@ in {
|
|||
A list of scripts which will be executed in response to network events.
|
||||
'';
|
||||
};
|
||||
|
||||
enableStrongSwan = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Enable the StrongSwan plugin.
|
||||
</para><para>
|
||||
If you enable this option the
|
||||
<literal>networkmanager_strongswan</literal> plugin will be added to
|
||||
the <option>networking.networkmanager.packages</option> option
|
||||
so you don't need to to that yourself.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -335,7 +348,11 @@ in {
|
|||
|
||||
security.polkit.extraConfig = polkitConf;
|
||||
|
||||
services.dbus.packages = cfg.packages;
|
||||
networking.networkmanager.packages =
|
||||
mkIf cfg.enableStrongSwan [ pkgs.networkmanager_strongswan ];
|
||||
|
||||
services.dbus.packages =
|
||||
optional cfg.enableStrongSwan pkgs.strongswanNM ++ cfg.packages;
|
||||
|
||||
services.udev.packages = cfg.packages;
|
||||
};
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, procps
|
||||
{ stdenv, fetchurl, intltool, pkgconfig, networkmanager, strongswanNM, procps
|
||||
, gnome3, libgnome_keyring, libsecret }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
|||
sed -i "s,nm_libexecdir=.*,nm_libexecdir=$out/libexec," "configure"
|
||||
'';
|
||||
|
||||
buildInputs = [ networkmanager libsecret ]
|
||||
buildInputs = [ networkmanager strongswanNM libsecret ]
|
||||
++ (with gnome3; [ gtk libgnome_keyring networkmanagerapplet ]);
|
||||
|
||||
nativeBuildInputs = [ intltool pkgconfig ];
|
||||
|
@ -26,9 +26,10 @@ stdenv.mkDerivation rec {
|
|||
--replace "/sbin/sysctl" "${procps}/bin/sysctl"
|
||||
'';
|
||||
|
||||
configureFlags = [ "--with-charon=${strongswanNM}/libexec/ipsec/charon-nm" ];
|
||||
|
||||
meta = {
|
||||
description = "NetworkManager's strongswan plugin";
|
||||
inherit (networkmanager.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -1,7 +1,14 @@
|
|||
{ stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook
|
||||
, curl, trousers, sqlite, iptables, libxml2, openresolv
|
||||
, ldns, unbound, pcsclite, openssl, systemd, pam
|
||||
, enableTNC ? false }:
|
||||
{ stdenv, fetchurl
|
||||
, pkgconfig, autoreconfHook
|
||||
, gmp, python, iptables, ldns, unbound, openssl, pcsclite
|
||||
, openresolv
|
||||
, systemd, pam
|
||||
|
||||
, enableTNC ? false, curl, trousers, sqlite, libxml2
|
||||
, enableNetworkManager ? false, networkmanager
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "strongswan-${version}";
|
||||
|
@ -17,8 +24,9 @@ stdenv.mkDerivation rec {
|
|||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
buildInputs =
|
||||
[ gmp python iptables ldns unbound openssl pcsclite ]
|
||||
++ stdenv.lib.optionals enableTNC [ curl trousers sqlite libxml2 ]
|
||||
++ stdenv.lib.optionals stdenv.isLinux [ systemd.dev pam ];
|
||||
++ optionals enableTNC [ curl trousers sqlite libxml2 ]
|
||||
++ optionals stdenv.isLinux [ systemd.dev pam ]
|
||||
++ optionals enableNetworkManager [ networkmanager ];
|
||||
|
||||
patches = [
|
||||
./ext_auth-path.patch
|
||||
|
@ -54,9 +62,9 @@ stdenv.mkDerivation rec {
|
|||
"--enable-forecast" "--enable-connmark" "--enable-acert"
|
||||
"--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound"
|
||||
"--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly" ]
|
||||
++ stdenv.lib.optional stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ]
|
||||
++ stdenv.lib.optional (stdenv.system == "i686-linux") "--enable-padlock"
|
||||
++ stdenv.lib.optionals enableTNC [
|
||||
++ optionals stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ]
|
||||
++ optional (stdenv.system == "i686-linux") "--enable-padlock"
|
||||
++ optionals enableTNC [
|
||||
"--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf"
|
||||
"--enable-curl"
|
||||
"--enable-eap-tnc" "--enable-eap-ttls" "--enable-eap-dynamic" "--enable-tnccs-20"
|
||||
|
@ -65,14 +73,15 @@ stdenv.mkDerivation rec {
|
|||
"--enable-tnc-ifmap" "--enable-tnc-imc" "--enable-tnc-imv"
|
||||
"--with-tss=trousers"
|
||||
"--enable-aikgen"
|
||||
"--enable-sqlite" ];
|
||||
"--enable-sqlite" ]
|
||||
++ optional enableNetworkManager "--enable-nm";
|
||||
|
||||
NIX_LDFLAGS = "-lgcc_s" ;
|
||||
|
||||
meta = {
|
||||
description = "OpenSource IPsec-based VPN Solution";
|
||||
homepage = https://www.strongswan.org;
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -4622,9 +4622,9 @@ with pkgs;
|
|||
preCheck = "export PATH=dist/build/stutter:$PATH";
|
||||
});
|
||||
|
||||
strongswan = callPackage ../tools/networking/strongswan { };
|
||||
|
||||
strongswanTNC = callPackage ../tools/networking/strongswan { enableTNC=true; };
|
||||
strongswan = callPackage ../tools/networking/strongswan { };
|
||||
strongswanTNC = callPackage ../tools/networking/strongswan { enableTNC = true; };
|
||||
strongswanNM = callPackage ../tools/networking/strongswan { enableNetworkManager = true; };
|
||||
|
||||
su = shadow.su;
|
||||
|
||||
|
|
Loading…
Reference in a new issue