From 273fb91b49f929b1dc8fbd584f7944df080282df Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 13 Aug 2015 14:59:56 +0200 Subject: [PATCH] miniupnpd: 1.9.{20150430 -> 20150721} Drop removed libnfnetlink dependency and simplify build. Don't yet update miniupnpc because it breaks bitcoin 0.11. --- pkgs/tools/networking/miniupnpd/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 11262460e716..0d852573eab8 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -1,26 +1,23 @@ -{ stdenv, fetchurl, iptables, libnfnetlink }: +{ stdenv, fetchurl, iptables, pkgconfig }: assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "miniupnpd-1.9.20150430"; + name = "miniupnpd-1.9.20150721"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "0ajqs3lf2cgq5fm1v79fa23sbb623i89sqnx7d9cnqbqq5py1k71"; - name = "miniupnpd-1.9.20150430.tar.gz"; + sha256 = "0w2422wfcir333qd300swkdvmksdfdllspplnz8vbv13a1724h4k"; + name = "${name}.tar.gz"; }; - buildInputs = [ iptables libnfnetlink ]; + buildInputs = [ iptables ]; + nativeBuildInputs= [ pkgconfig ]; - NIX_CFLAGS_COMPILE = "-DIPTABLES_143"; - - NIX_CFLAGS_LINK = "-liptc -lnfnetlink"; + NIX_CFLAGS_LINK = "-liptc"; makefile = "Makefile.linux"; - makeFlags = "LIBS="; - buildFlags = "miniupnpd genuuid"; installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";