From dade32b409ebb1ada3ca0f6f32b8aefd1260d42f Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 25 Nov 2022 10:27:49 +0100 Subject: [PATCH] miniupnpc: use cmake for build this fixes strange linking issues on darwin when any attempt to link with libminiupnpc ends with "Killed: 9" --- pkgs/tools/networking/miniupnpc/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index e3a97d1b4a6d..74406f2947da 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -1,8 +1,7 @@ { 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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ba6ca94e1f4..7949255efe61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };