From e4a2ef5611b62ebc89b050a9bea31b355aac3f79 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sat, 26 Oct 2024 12:30:00 +0200 Subject: [PATCH 1/2] i2pd: remove unused USE_AVX flag Since release 2.35 that flag has been removed. Therefore we remove it to avoid confusion. https://github.com/PurpleI2P/i2pd/releases/tag/2.35.0 --- pkgs/tools/networking/i2pd/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 2504ca0ff14aa..5debcf29896fb 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -3,7 +3,6 @@ , boost, zlib, openssl , upnpSupport ? true, miniupnpc , aesniSupport ? stdenv.hostPlatform.aesSupport -, avxSupport ? stdenv.hostPlatform.avxSupport }: stdenv.mkDerivation rec { @@ -27,7 +26,6 @@ stdenv.mkDerivation rec { 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) ]; From a178d8dd730a0071573944226b6125aa1117492d Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sun, 27 Oct 2024 19:45:00 +0100 Subject: [PATCH 2/2] i2pd: mark as broken on darwin Currently fails with error: ``` libi2pd/FS.h:21:10: error: 'TARGET_OS_SIMULATOR' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_] ^ 1 error generated. ``` --- pkgs/tools/networking/i2pd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 5debcf29896fb..260ce8a79b142 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ edwtjo ]; platforms = platforms.unix; mainProgram = "i2pd"; + broken = stdenv.hostPlatform.isDarwin; }; }