colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #28056 from matthewbauer/miniupnpc-fix

Browse Source 
miniupnpc: fix on darwin
This commit is contained in:
Daiderd Jordan 2017-08-10 00:08:10 +02:00 committed by GitHub
commit e5f0c4f840
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

@ -3188,7 +3188,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;