diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-03-03 15:56:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-03 15:56:05 +0000 |
| commit | 9936ed4920974c558eded168d2e36e726bd56b11 (patch) | |
| tree | 62998e39015c1180c2ec6fbe97276499e4f6ac66 /pkgs/tools | |
| parent | ce82ae17a9ddbcf88b5feb94a2a9eaa53a725ce0 (diff) | |
| parent | fe4f4de1c92714aa9a2add7ffb3ca83a861d6d4e (diff) | |
| download | nixlib-9936ed4920974c558eded168d2e36e726bd56b11.tar nixlib-9936ed4920974c558eded168d2e36e726bd56b11.tar.gz nixlib-9936ed4920974c558eded168d2e36e726bd56b11.tar.bz2 nixlib-9936ed4920974c558eded168d2e36e726bd56b11.tar.lz nixlib-9936ed4920974c558eded168d2e36e726bd56b11.tar.xz nixlib-9936ed4920974c558eded168d2e36e726bd56b11.tar.zst nixlib-9936ed4920974c558eded168d2e36e726bd56b11.zip | |
Merge pull request #31019 from teto/strongswan_rebased
[RFC/RDY] make l2tp work with Strongswan
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/network-manager/l2tp.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/networking/strongswan/default.nix | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index e5626dee1d4d..54670ff1bce7 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { postPatch = '' sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-l2tp-service.c + substituteInPlace ./Makefile.am \ + --replace '$(sysconfdir)/dbus-1/system.d' "$out/etc/dbus-1/system.d" + substituteInPlace ./src/nm-l2tp-service.c \ --replace /sbin/ipsec ${strongswan}/bin/ipsec \ --replace /sbin/xl2tpd ${xl2tpd}/bin/xl2tpd diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 3cbff4f25ae8..042f8bea3d62 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -76,6 +76,11 @@ stdenv.mkDerivation rec { "--enable-sqlite" ] ++ optional enableNetworkManager "--enable-nm"; + postInstall = '' + # this is needed for l2tp + echo "include /etc/ipsec.secrets" >> $out/etc/ipsec.secrets + ''; + NIX_LDFLAGS = "-lgcc_s" ; meta = { |