diff --git a/patches/326057.patch b/patches/326057.patch deleted file mode 100644 index c42db1ea..00000000 --- a/patches/326057.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix -index b643e472ea625e..b5d577d6139e28 100644 ---- a/pkgs/tools/networking/miniupnpc/default.nix -+++ b/pkgs/tools/networking/miniupnpc/default.nix -@@ -1,36 +1,38 @@ --{ -- lib, -- stdenv, -- fetchFromGitHub, -- cmake, -+{ lib -+, stdenv -+, fetchFromGitHub -+, cmake - }: - - stdenv.mkDerivation rec { - pname = "miniupnpc"; -- version = "2.2.8"; -+ version = "2.2.7"; - - src = fetchFromGitHub { - owner = "miniupnp"; - repo = "miniupnp"; -- rev = "miniupnpc_${lib.replaceStrings [ "." ] [ "_" ] version}"; -- hash = "sha256-kPH5nr+rIcF3mxl+L0kN5dn+9xvQccVa8EduwhuYboY="; -+ rev = "miniupnpc_${lib.replaceStrings ["."] ["_"] version}"; -+ hash = "sha256-cIijY1NcdF169tibfB13845UT9ZoJ/CZ+XLES9ctWTY="; - }; - - sourceRoot = "${src.name}/miniupnpc"; - - nativeBuildInputs = [ cmake ]; - -- cmakeFlags = [ -- (lib.cmakeBool "UPNPC_BUILD_SHARED" (!stdenv.hostPlatform.isStatic)) -- (lib.cmakeBool "UPNPC_BUILD_STATIC" stdenv.hostPlatform.isStatic) -- ]; -- - doCheck = !stdenv.isFreeBSD; - -+ makeFlags = [ "PREFIX=$(out)" ]; -+ - postInstall = '' -- mv $out/bin/upnpc-* $out/bin/upnpc -- mv $out/bin/upnp-listdevices-* $out/bin/upnp-listdevices -- mv $out/bin/external-ip.sh $out/bin/external-ip -+ chmod +x $out/lib/libminiupnpc${stdenv.hostPlatform.extensions.sharedLibrary} -+ -+ # for some reason cmake does not install binaries and manpages -+ # https://github.com/miniupnp/miniupnp/issues/637 -+ mkdir -p $out/bin -+ cp -a upnpc-static $out/bin/upnpc -+ cp -a ../external-ip.sh $out/bin/external-ip -+ mkdir -p $out/share/man -+ cp -a ../man3 $out/share/man - ''; - - meta = with lib; {