Unverified Commit 1b092a22 authored by Pavol Rusnak's avatar Pavol Rusnak Committed by GitHub
Browse files

Merge pull request #202815 from prusnak/miniupnpc-cmake 

miniupnpc: use cmake for build
parents b1fab71c 61018342

pkgs/applications/blockchains/bitcoin/default.nix

+0 −4
Original line number Diff line number Diff line
@@ -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;

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