nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-29 16:24:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

miniupnpc: use cmake for build

Browse Source 
this fixes strange linking issues on darwin when any attempt to link
with libminiupnpc ends with "Killed: 9"
This commit is contained in:
Pavol Rusnak 2022-11-25 10:27:49 +01:00
parent 0dc7388a00
commit dade32b409
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/networking/miniupnpc/default.nix
View File

@ -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;

4
pkgs/top-level/all-packages.nix
View File

@ -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 { };