From 8046afc4eaeda57f710ce2eee2124a1eba1002fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Sep 2022 11:37:29 +0200 Subject: [PATCH] i2pd: remove unecessary ? null from inputs (cherry picked from commit 64abd830b4b7e807ab9aced7d6e7669e539e43f3) --- pkgs/tools/networking/i2pd/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index f99d10deed84..941d60eb9270 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -1,13 +1,11 @@ { lib, stdenv, fetchFromGitHub , installShellFiles , boost, zlib, openssl -, upnpSupport ? true, miniupnpc ? null +, upnpSupport ? true, miniupnpc , aesniSupport ? stdenv.hostPlatform.aesSupport , avxSupport ? stdenv.hostPlatform.avxSupport }: -assert upnpSupport -> miniupnpc != null; - stdenv.mkDerivation rec { pname = "i2pd"; version = "2.43.0"; @@ -19,8 +17,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-JIO1Zm7me/SX0W7sVHOesERnqvC7jy0Fu1vfKFePFd0="; }; - buildInputs = with lib; [ boost zlib openssl ] - ++ optional upnpSupport miniupnpc; + buildInputs = [ boost zlib openssl ] + ++ lib.optional upnpSupport miniupnpc; nativeBuildInputs = [ installShellFiles