From 1609f860f58b0543044797b427f56498f3b481b5 Mon Sep 17 00:00:00 2001 From: Nikola Knezevic Date: Wed, 6 Mar 2019 15:14:57 +0100 Subject: [PATCH] strongswan: Make it build on macOS Original expression could not be built on macOS due to using dependencies to Linux only packages. This change fixes that by grouping the dependencies based on the suitable system. In addition, it uses `configure` flags recommended by the project for building on macOS, as well the ones used by Homebrew. --- pkgs/tools/networking/strongswan/default.nix | 44 ++++++++++++++------ 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 9ee5a0cf849..d5b3a00c733 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -8,6 +8,7 @@ , enableTNC ? false, trousers, sqlite, libxml2 , enableNetworkManager ? false, networkmanager , libpcap +, darwin }: # Note on curl support: If curl is built with gnutls as its backend, the @@ -29,9 +30,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = - [ curl gmp python iptables ldns unbound openssl pcsclite ] + [ curl gmp python ldns unbound openssl pcsclite ] ++ optionals enableTNC [ trousers sqlite libxml2 ] - ++ optionals stdenv.isLinux [ systemd.dev pam ] + ++ optionals stdenv.isLinux [ systemd.dev pam iptables ] + ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ SystemConfiguration ]) ++ optionals enableNetworkManager [ networkmanager ] # ad-hoc fix for https://github.com/NixOS/nixpkgs/pull/51787 # Remove when the above PR lands in master @@ -41,23 +43,24 @@ stdenv.mkDerivation rec { ./ext_auth-path.patch ./firewall_defaults.patch ./updown-path.patch - (substituteAll { + (optional stdenv.isLinux (substituteAll { src = ./modprobe-path.patch; inherit kmod; - }) + })) ]; postPatch = '' - substituteInPlace src/libcharon/plugins/resolve/resolve_handler.c --replace "/sbin/resolvconf" "${openresolv}/sbin/resolvconf" - # swanctl can be configured by files in SWANCTLDIR which defaults to # $out/etc/swanctl. Since that directory is in the nix store users can't # modify it. Ideally swanctl accepts a command line option for specifying # the configuration files. In the absence of that we patch swanctl to look # for configuration files in /etc/swanctl. substituteInPlace src/swanctl/swanctl.h --replace "SWANCTLDIR" "\"/etc/swanctl\"" + '' + optionalString stdenv.isLinux '' # glibc-2.26 reorganized internal includes sed '1i#include ' -i src/libstrongswan/utils/utils/memory.h + + substituteInPlace src/libcharon/plugins/resolve/resolve_handler.c --replace "/sbin/resolvconf" "${openresolv}/sbin/resolvconf" ''; preConfigure = '' @@ -65,17 +68,24 @@ stdenv.mkDerivation rec { ''; configureFlags = - [ "--enable-swanctl" "--enable-cmd" "--enable-systemd" - "--enable-farp" "--enable-dhcp" + [ "--enable-swanctl" + "--enable-cmd" "--enable-openssl" "--enable-eap-sim" "--enable-eap-sim-file" "--enable-eap-simaka-pseudonym" "--enable-eap-simaka-reauth" "--enable-eap-identity" "--enable-eap-md5" "--enable-eap-gtc" "--enable-eap-aka" "--enable-eap-aka-3gpp2" "--enable-eap-mschapv2" "--enable-eap-radius" "--enable-xauth-eap" "--enable-ext-auth" - "--enable-forecast" "--enable-connmark" "--enable-acert" + "--enable-acert" "--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound" - "--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly" + "--enable-chapoly" "--enable-curl" ] + ++ optionals stdenv.isLinux [ + "--enable-farp" "--enable-dhcp" + "--enable-systemd" + "--enable-xauth-pam" + "--enable-forecast" + "--enable-connmark" + "--enable-af-alg" ] ++ optionals stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ] ++ optional (stdenv.hostPlatform.system == "i686-linux") "--enable-padlock" ++ optionals enableTNC [ @@ -89,7 +99,17 @@ stdenv.mkDerivation rec { "--enable-sqlite" ] ++ optionals enableNetworkManager [ "--enable-nm" - "--with-nm-ca-dir=/etc/ssl/certs" + "--with-nm-ca-dir=/etc/ssl/certs" ] + # Taken from: https://wiki.strongswan.org/projects/strongswan/wiki/MacOSX + ++ optionals stdenv.isDarwin [ + "--disable-systemd" + "--disable-xauth-pam" + "--disable-kernel-netlink" + "--enable-kernel-pfkey" + "--enable-kernel-pfroute" + "--enable-kernel-libipsec" + "--enable-osx-attr" + "--disable-scripts" ]; postInstall = '' @@ -97,7 +117,7 @@ stdenv.mkDerivation rec { echo "include /etc/ipsec.secrets" >> $out/etc/ipsec.secrets ''; - NIX_LDFLAGS = "-lgcc_s" ; + NIX_LDFLAGS = optionalString stdenv.cc.isGNU "-lgcc_s" ; meta = { description = "OpenSource IPsec-based VPN Solution";