diff options
author | Bas van Dijk <v.dijk.bas@gmail.com> | 2017-10-24 23:55:05 +0200 |
---|---|---|
committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2017-11-30 23:03:32 +0100 |
commit | 460a4b08328a3f5f97042c8500303421a750abd6 (patch) | |
tree | 7bbd7b4d7ebd803d042ca9de3d1f576d8bbdeff7 /pkgs/tools/networking/strongswan | |
parent | ef8933233b954a28ce8981ec831713cc7a0afc6d (diff) | |
download | nixpkgs-460a4b08328a3f5f97042c8500303421a750abd6.tar nixpkgs-460a4b08328a3f5f97042c8500303421a750abd6.tar.gz nixpkgs-460a4b08328a3f5f97042c8500303421a750abd6.tar.bz2 nixpkgs-460a4b08328a3f5f97042c8500303421a750abd6.tar.lz nixpkgs-460a4b08328a3f5f97042c8500303421a750abd6.tar.xz nixpkgs-460a4b08328a3f5f97042c8500303421a750abd6.tar.zst nixpkgs-460a4b08328a3f5f97042c8500303421a750abd6.zip |
networkmanager_strongswan: fix package
Added the boolean option: networking.networkmanager.enableStrongSwan which enables the networkmanager_strongswan plugin and adds strongswanNM to the dbus packages. This was contributed by @wucke13, @eqyiel and @globin. Fixes: #29873
Diffstat (limited to 'pkgs/tools/networking/strongswan')
-rw-r--r-- | pkgs/tools/networking/strongswan/default.nix | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 77409f6fc3e..eff498a174e 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -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; }; } |