From a4f433c03ccba743727e550edee80653ea3ad2ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Tue, 23 Jan 2018 11:58:41 +0100 Subject: [PATCH] i2pd: expose flags --- pkgs/tools/networking/i2pd/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 251268b6f30..bd98eca5354 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -1,4 +1,11 @@ -{ stdenv, fetchFromGitHub, fetchpatch, boost, zlib, openssl }: +{ stdenv, fetchFromGitHub, fetchpatch +, boost, zlib, openssl +, upnpSupport ? true, miniupnpc ? null +, aesniSupport ? false +, avxSupport ? false +}: + +assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { @@ -13,8 +20,14 @@ stdenv.mkDerivation rec { sha256 = "1yl5h7mls50vkg7x5510mljmgsm02arqhcanwkrqw4ilwvcp1mgz"; }; - buildInputs = [ boost zlib openssl ]; - makeFlags = [ "USE_AESNI=no" "USE_AVX=no" ]; + buildInputs = with stdenv.lib; [ boost zlib openssl ] + ++ optional upnpSupport miniupnpc; + makeFlags = + let ynf = a: b: a + "=" + (if b then "yes" else "no"); in + [ (ynf "USE_AESNI" aesniSupport) + (ynf "USE_AVX" avxSupport) + (ynf "USE_UPNP" upnpSupport) + ]; installPhase = '' install -D i2pd $out/bin/i2pd