summary refs log tree commit diff
path: root/pkgs/tools/networking/miniupnpd/default.nix
diff options
context:
space:
mode:
authorMathijs Kwik <mathijs@bluescreen303.nl>2012-10-13 18:34:31 +0200
committerMathijs Kwik <mathijs@bluescreen303.nl>2012-10-13 20:39:40 +0200
commite9f0cae00f48a253d1975752b6811ee8ba97f226 (patch)
tree358dc6dfb04fd9d01789ce1039dbe7e7bed2365f /pkgs/tools/networking/miniupnpd/default.nix
parentc39805d81cd73848d6508d5abb5739b03bffc122 (diff)
downloadnixpkgs-e9f0cae00f48a253d1975752b6811ee8ba97f226.tar
nixpkgs-e9f0cae00f48a253d1975752b6811ee8ba97f226.tar.gz
nixpkgs-e9f0cae00f48a253d1975752b6811ee8ba97f226.tar.bz2
nixpkgs-e9f0cae00f48a253d1975752b6811ee8ba97f226.tar.lz
nixpkgs-e9f0cae00f48a253d1975752b6811ee8ba97f226.tar.xz
nixpkgs-e9f0cae00f48a253d1975752b6811ee8ba97f226.tar.zst
nixpkgs-e9f0cae00f48a253d1975752b6811ee8ba97f226.zip
miniupnpd: upgrade to 1.7.20121005
Diffstat (limited to 'pkgs/tools/networking/miniupnpd/default.nix')
-rw-r--r--pkgs/tools/networking/miniupnpd/default.nix23
1 files changed, 12 insertions, 11 deletions
diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index 6db47f8e079..b5002d22990 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -1,33 +1,34 @@
-{ stdenv, fetchurl, iptables }:
+{ stdenv, fetchurl, iptables, libnfnetlink, libnetfilter_conntrack }:
 
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "miniupnpd-1.4";
+  name = "miniupnpd-1.7.20121005";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "06q5agkzv2snjxcsszpm27h8bqv41jijahs8jqnarxdrik97rfl5";
+    sha256 = "03kaxj808hgj1zf2528pzilgywgh70mh0qivjb5nm3spziiq32sv";
   };
 
-  buildInputs = [ iptables ];
+  buildInputs = [ iptables libnfnetlink libnetfilter_conntrack ];
+
+  patchPhase = ''
+    sed -i -e 's/upnputils\.o -lnfnetlink/upnputils.o/' Makefile.linux
+  '';
 
   NIX_CFLAGS_COMPILE = "-DIPTABLES_143";
 
-  NIX_CFLAGS_LINK = "-liptc";
-  
+  NIX_CFLAGS_LINK = "-liptc -lnfnetlink";
+
   makefile = "Makefile.linux";
 
   makeFlags = "LIBS=";
 
-  postBuild = "cat config.h";
-
   installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
 
-  postInstall =
+  preInstall =
     ''
-      mkdir -p $out/share/man/man1
-      cp miniupnpd.1 $out/share/man/man1/
+      mkdir -p $out/share/man/man8
     '';
 
   meta = {