summary refs log tree commit diff
path: root/pkgs/tools/networking/miniupnpd
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2015-08-13 14:59:56 +0200
committerTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2015-08-14 03:07:09 +0200
commit273fb91b49f929b1dc8fbd584f7944df080282df (patch)
tree76d09bb97c4e0618b7c4c1be6ae516b20ae26875 /pkgs/tools/networking/miniupnpd
parentc2e593d142b16b08b3b2c1eb9795362a630b9086 (diff)
downloadnixpkgs-273fb91b49f929b1dc8fbd584f7944df080282df.tar
nixpkgs-273fb91b49f929b1dc8fbd584f7944df080282df.tar.gz
nixpkgs-273fb91b49f929b1dc8fbd584f7944df080282df.tar.bz2
nixpkgs-273fb91b49f929b1dc8fbd584f7944df080282df.tar.lz
nixpkgs-273fb91b49f929b1dc8fbd584f7944df080282df.tar.xz
nixpkgs-273fb91b49f929b1dc8fbd584f7944df080282df.tar.zst
nixpkgs-273fb91b49f929b1dc8fbd584f7944df080282df.zip
miniupnpd: 1.9.{20150430 -> 20150721}
Drop removed libnfnetlink dependency and simplify build.

Don't yet update miniupnpc because it breaks bitcoin 0.11.
Diffstat (limited to 'pkgs/tools/networking/miniupnpd')
-rw-r--r--pkgs/tools/networking/miniupnpd/default.nix17
1 files changed, 7 insertions, 10 deletions
diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index 11262460e71..0d852573eab 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)";