Merge pull request #193490 from SuperSandro2000/i2pd

2022-10-01 01:25:07 +02:00
parent 99bcca1e34 64abd830b4
commit 0a43ebea9e
1 changed files with 3 additions and 5 deletions
@@ -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