Merge pull request #28056 from matthewbauer/miniupnpc-fix

miniupnpc: fix on darwin

authored by Daiderd Jordan and committed by GitHub e5f0c4f8 e9a2cfda

+7 -3
+5 -2
pkgs/tools/networking/miniupnpc/default.nix
··· 1 - { stdenv, fetchurl }: 2 3 let 4 generic = { version, sha256 }: ··· 10 inherit sha256; 11 }; 12 13 patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch; 14 15 doCheck = !stdenv.isFreeBSD; 16 17 - installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; 18 19 meta = { 20 homepage = http://miniupnp.free.fr/;
··· 1 + { stdenv, fetchurl, which, cctools }: 2 3 let 4 generic = { version, sha256 }: ··· 10 inherit sha256; 11 }; 12 13 + nativeBuildInputs = [] ++ 14 + stdenv.lib.optionals stdenv.isDarwin [ which cctools ]; 15 + 16 patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch; 17 18 doCheck = !stdenv.isFreeBSD; 19 20 + makeFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; 21 22 meta = { 23 homepage = http://miniupnp.free.fr/;
+2 -1
pkgs/top-level/all-packages.nix
··· 3188 3189 minissdpd = callPackage ../tools/networking/minissdpd { }; 3190 3191 - inherit (callPackage ../tools/networking/miniupnpc { }) 3192 miniupnpc_1 miniupnpc_2; 3193 miniupnpc = miniupnpc_1; 3194
··· 3188 3189 minissdpd = callPackage ../tools/networking/minissdpd { }; 3190 3191 + inherit (callPackage ../tools/networking/miniupnpc 3192 + { inherit (darwin) cctools; }) 3193 miniupnpc_1 miniupnpc_2; 3194 miniupnpc = miniupnpc_1; 3195