BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

miniupnpc: fix on darwin

Browse source 
For some reason miniupnpc needs libtool for static linking. Probably not ideal
but it’s doing similar on other platforms as well (using ar).
This commit is contained in:
Matthew Bauer 2017-08-08 20:37:00 -07:00
parent f3a54b014c
commit c7f14143c4
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/tools/networking/miniupnpc/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, which, cctools }:
let
generic = { version, sha256 }:
@ -10,11 +10,14 @@ let
inherit sha256;
};
nativeBuildInputs = [] ++
stdenv.lib.optionals stdenv.isDarwin [ which cctools ];
patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch;
doCheck = !stdenv.isFreeBSD;
installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
makeFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
meta = {
homepage = http://miniupnp.free.fr/;

3
pkgs/top-level/all-packages.nix
View file

@ -3192,7 +3192,8 @@ with pkgs;
minissdpd = callPackage ../tools/networking/minissdpd { };
inherit (callPackage ../tools/networking/miniupnpc { })
inherit (callPackage ../tools/networking/miniupnpc
{ inherit (darwin) cctools; })
miniupnpc_1 miniupnpc_2;
miniupnpc = miniupnpc_1;