Unverified Commit dade32b4 authored by Pavol Rusnak's avatar Pavol Rusnak
Browse files

miniupnpc: use cmake for build 

this fixes strange linking issues on darwin when any attempt to link
with libminiupnpc ends with "Killed: 9"
parent 0dc7388a

pkgs/tools/networking/miniupnpc/default.nix

+2 −3
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchurl

, which

, cctools

, cmake

}:



stdenv.mkDerivation rec {
@@ -14,7 +13,7 @@ stdenv.mkDerivation rec { 
    sha256 = "0jrc84lkc7xb53rb8dbswxrxj21ndj1iiclmk3r9wkp6xm55w6j8";

  };



  nativeBuildInputs = lib.optionals stdenv.isDarwin [ which cctools ];

  nativeBuildInputs = [ cmake ];



  patches = lib.optional stdenv.isFreeBSD ./freebsd.patch;

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -9318,9 +9318,7 @@ with pkgs; 














  minissdpd = callPackage ../tools/networking/minissdpd { };



























  miniupnpc = callPackage ../tools/networking/miniupnpc {













    inherit (darwin) cctools;













  };













  miniupnpc = callPackage ../tools/networking/miniupnpc { };





























  miniupnpd = callPackage ../tools/networking/miniupnpd { };