Merge pull request #221831 from justinas/miniupnpd-iptables-legacy

This commit is contained in:
Sandro 2023-03-19 21:54:36 +01:00 committed by GitHub
commit 0bb4866281
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,10 +1,10 @@
{ stdenv, lib, fetchurl, iptables, libuuid, openssl, pkg-config { stdenv, lib, fetchurl, iptables-legacy, libuuid, openssl, pkg-config
, which, iproute2, gnused, coreutils, gawk, makeWrapper , which, iproute2, gnused, coreutils, gawk, makeWrapper
, nixosTests , nixosTests
}: }:
let let
scriptBinEnv = lib.makeBinPath [ which iproute2 iptables gnused coreutils gawk ]; scriptBinEnv = lib.makeBinPath [ which iproute2 iptables-legacy gnused coreutils gawk ];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "miniupnpd"; pname = "miniupnpd";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "0crv975qqppnj27jba96yysq2911y49vjd74sp9vnjb54z0d9pyi"; sha256 = "0crv975qqppnj27jba96yysq2911y49vjd74sp9vnjb54z0d9pyi";
}; };
buildInputs = [ iptables libuuid openssl ]; buildInputs = [ iptables-legacy libuuid openssl ];
nativeBuildInputs= [ pkg-config makeWrapper ]; nativeBuildInputs= [ pkg-config makeWrapper ];
@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
passthru.tests = { passthru.tests = {
bittorrent-integration = nixosTests.bittorrent; bittorrent-integration = nixosTests.bittorrent;
inherit (nixosTests) upnp;
}; };
meta = with lib; { meta = with lib; {