cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #52618 from hedning/ad-hoc-fix-strongswan

Browse source 
strongswan: ad-hoc fix build
This commit is contained in:
Jörg Thalheim 2018-12-21 13:41:58 +01:00 committed by GitHub
commit 92343831c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/tools/networking/strongswan/default.nix
View file

@ -6,6 +6,7 @@
, curl , curl
, enableTNC ? false, trousers, sqlite, libxml2 , enableTNC ? false, trousers, sqlite, libxml2
, enableNetworkManager ? false, networkmanager , enableNetworkManager ? false, networkmanager
, libpcap
}: }:
# Note on curl support: If curl is built with gnutls as its backend, the # Note on curl support: If curl is built with gnutls as its backend, the
@ -30,7 +31,10 @@ stdenv.mkDerivation rec {
[ curl gmp python iptables ldns unbound openssl pcsclite ] [ curl gmp python iptables ldns unbound openssl pcsclite ]
++ optionals enableTNC [ trousers sqlite libxml2 ] ++ optionals enableTNC [ trousers sqlite libxml2 ]
++ optionals stdenv.isLinux [ systemd.dev pam ] ++ optionals stdenv.isLinux [ systemd.dev pam ]
++ optionals enableNetworkManager [ networkmanager ]; ++ optionals enableNetworkManager [ networkmanager ]
# ad-hoc fix for https://github.com/NixOS/nixpkgs/pull/51787
# Remove when the above PR lands in master
++ [ libpcap ];
patches = [ patches = [
./ext_auth-path.patch ./ext_auth-path.patch