summary refs log tree commit diff
path: root/pkgs/tools/networking/network-manager/strongswan.nix
diff options
context:
space:
mode:
authorBas van Dijk <v.dijk.bas@gmail.com>2017-10-24 23:55:05 +0200
committerBas van Dijk <v.dijk.bas@gmail.com>2017-11-30 23:03:32 +0100
commit460a4b08328a3f5f97042c8500303421a750abd6 (patch)
tree7bbd7b4d7ebd803d042ca9de3d1f576d8bbdeff7 /pkgs/tools/networking/network-manager/strongswan.nix
parentef8933233b954a28ce8981ec831713cc7a0afc6d (diff)
downloadnixlib-460a4b08328a3f5f97042c8500303421a750abd6.tar
nixlib-460a4b08328a3f5f97042c8500303421a750abd6.tar.gz
nixlib-460a4b08328a3f5f97042c8500303421a750abd6.tar.bz2
nixlib-460a4b08328a3f5f97042c8500303421a750abd6.tar.lz
nixlib-460a4b08328a3f5f97042c8500303421a750abd6.tar.xz
nixlib-460a4b08328a3f5f97042c8500303421a750abd6.tar.zst
nixlib-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/network-manager/strongswan.nix')
-rw-r--r--pkgs/tools/networking/network-manager/strongswan.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix
index 9d26a84d6f2e..f26571874644 100644
--- a/pkgs/tools/networking/network-manager/strongswan.nix
+++ b/pkgs/tools/networking/network-manager/strongswan.nix
@@ -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;
   };
 }
-