mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-16 17:14:00 +00:00
Merge pull request #202815 from prusnak/miniupnpc-cmake
miniupnpc: use cmake for build
This commit is contained in:
commit
1b092a2208
pkgs
applications/blockchains/bitcoin
tools/networking/miniupnpc
top-level
@ -72,10 +72,6 @@ stdenv.mkDerivation rec {
|
||||
"--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
|
||||
];
|
||||
|
||||
# fix "Killed: 9 test/test_bitcoin"
|
||||
# https://github.com/NixOS/nixpkgs/issues/179474
|
||||
hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "fortify" "stackprotector" ];
|
||||
|
||||
checkInputs = [ python3 ];
|
||||
|
||||
doCheck = true;
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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 { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user