diff options
| author | janus <janus@xn--kn-1ia.guru> | 2015-11-24 12:00:19 +0000 |
|---|---|---|
| committer | janus <janus@xn--kn-1ia.guru> | 2016-01-01 17:01:13 +0000 |
| commit | c01dbc4932955a8c1fa2f28a135aafaa4111ef81 (patch) | |
| tree | e26a2387b718d2101bc14d49446627a4d67143f0 /pkgs/tools/networking/miniupnpc | |
| parent | 3cb831d2bcb6d534325178c6928bc893a14534f8 (diff) | |
| download | nixpkgs-c01dbc4932955a8c1fa2f28a135aafaa4111ef81.tar nixpkgs-c01dbc4932955a8c1fa2f28a135aafaa4111ef81.tar.gz nixpkgs-c01dbc4932955a8c1fa2f28a135aafaa4111ef81.tar.bz2 nixpkgs-c01dbc4932955a8c1fa2f28a135aafaa4111ef81.tar.lz nixpkgs-c01dbc4932955a8c1fa2f28a135aafaa4111ef81.tar.xz nixpkgs-c01dbc4932955a8c1fa2f28a135aafaa4111ef81.tar.zst nixpkgs-c01dbc4932955a8c1fa2f28a135aafaa4111ef81.zip | |
FreeBSD patches for GNU m4, stdenv, miniupnpc
Diffstat (limited to 'pkgs/tools/networking/miniupnpc')
| -rw-r--r-- | pkgs/tools/networking/miniupnpc/default.nix | 17 | ||||
| -rw-r--r-- | pkgs/tools/networking/miniupnpc/freebsd.patch | 11 |
2 files changed, 20 insertions, 8 deletions
diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index ac68b55ad17..644045800d4 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -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)"; diff --git a/pkgs/tools/networking/miniupnpc/freebsd.patch b/pkgs/tools/networking/miniupnpc/freebsd.patch new file mode 100644 index 00000000000..42ae85a8e6b --- /dev/null +++ b/pkgs/tools/networking/miniupnpc/freebsd.patch @@ -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 |