public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9101 from ts468/upstream.strongswan 

strongswan: add TNC build option
This commit is contained in:
ts468 2015-08-03 17:53:01 +02:00
parent 1b0e82659c 6f727a8a83
commit c6159b2614
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/tools/networking/strongswan/default.nix
View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook }: { stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook
, curl, trousers, sqlite
, enableTNC ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "strongswan-5.3.2"; name = "strongswan-5.3.2";
@ -10,7 +12,9 @@ stdenv.mkDerivation rec {
dontPatchELF = true; dontPatchELF = true;
buildInputs = [ gmp pkgconfig python autoreconfHook ]; buildInputs =
[ gmp pkgconfig python autoreconfHook ]
++ stdenv.lib.optionals enableTNC [ curl trousers sqlite ];
patches = [ patches = [
./ext_auth-path.patch ./ext_auth-path.patch
@ -18,7 +22,17 @@ stdenv.mkDerivation rec {
./updown-path.patch ./updown-path.patch
]; ];
configureFlags = [ "--enable-swanctl" "--enable-cmd" ]; configureFlags =
[ "--enable-swanctl" "--enable-cmd" ]
++ stdenv.lib.optionals enableTNC [
"--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf"
"--enable-curl" "--enable-openssl" "--enable-eap-identity" "--enable-eap-md5" "--enable-eap-mschapv2"
"--enable-eap-tnc" "--enable-eap-ttls" "--enable-eap-dynamic" "--enable-tnccs-20"
"--enable-tnc-imc" "--enable-imc-os" "--enable-imc-attestation"
"--enable-tnc-imv" "--enable-imv-attestation"
"--with-tss=trousers"
"--enable-aikgen"
"--enable-sqlite" ];
NIX_LDFLAGS = "-lgcc_s" ; NIX_LDFLAGS = "-lgcc_s" ;

2
pkgs/top-level/all-packages.nix
View File

@ -3068,6 +3068,8 @@ let
strongswan = callPackage ../tools/networking/strongswan { }; strongswan = callPackage ../tools/networking/strongswan { };
strongswanTNC = callPackage ../tools/networking/strongswan { enableTNC=true; };
su = shadow.su; su = shadow.su;
subsonic = callPackage ../servers/misc/subsonic { }; subsonic = callPackage ../servers/misc/subsonic { };