FreeBSD patches for GNU m4, stdenv, miniupnpc

2016-01-01 17:01:13 +00:00
parent 3cb831d2bc
commit c01dbc4932
4 changed files with 116 additions and 9 deletions
@@ -1,17 +1,18 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchurl }:

-let version = "24d54ba13af4e53aba19c23898a373feecb41bd0"; in
+let version = "1.9.20150430"; in
 stdenv.mkDerivation rec {
  name = "miniupnpc-${version}";

-  src = fetchFromGitHub {
-    owner = "miniupnp";
-    repo = "miniupnp";
-    sha256 = "0j78dvlfh1a3a27zhvv001cb1d7vcgyv33bd1zr36drg64b6hrgw";
-    rev = version;
+  src = fetchurl {
+    url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
+    sha256 = "0ivnvzla0l2pzmy8s0j8ss0fnpsii7z9scvyl4a13g9k911hgmvn";
+    name = "${name}.tar.gz";
  };

-  doCheck = true;
+  patches = stdenv.lib.optional stdenv.isFreeBSD [ ./freebsd.patch ];
+
+  doCheck = !stdenv.isFreeBSD;

  installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";

@@ -0,0 +1,11 @@
+diff --git a/minihttptestserver.c b/minihttptestserver.c
+index bbfdac3..a43999d 100644
+--- a/minihttptestserver.c
+++ b/minihttptestserver.c
+@@ -1,3 +1,6 @@
+#ifndef INADDR_LOOPBACK
+#define INADDR_LOOPBACK         0x7f000001
+#endif
+ /* $Id: minihttptestserver.c,v 1.17 2015/02/06 10:31:19 nanard Exp $ */
+  /* Project : miniUPnP
+    * Author : Thomas Bernard