From c7f14143c40dacbd4ca464a67d3da5538bf4e1ca Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 8 Aug 2017 20:37:00 -0700 Subject: [PATCH] miniupnpc: fix on darwin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For some reason miniupnpc needs libtool for static linking. Probably not ideal but it’s doing similar on other platforms as well (using ar). --- pkgs/tools/networking/miniupnpc/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 09459e0e283..2cca57121e9 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, which, cctools }: let generic = { version, sha256 }: @@ -10,11 +10,14 @@ let inherit sha256; }; + nativeBuildInputs = [] ++ + stdenv.lib.optionals stdenv.isDarwin [ which cctools ]; + patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch; doCheck = !stdenv.isFreeBSD; - installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; + makeFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)"; meta = { homepage = http://miniupnp.free.fr/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97cd763bb22..2da885c140c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3192,7 +3192,8 @@ with pkgs; minissdpd = callPackage ../tools/networking/minissdpd { }; - inherit (callPackage ../tools/networking/miniupnpc { }) + inherit (callPackage ../tools/networking/miniupnpc + { inherit (darwin) cctools; }) miniupnpc_1 miniupnpc_2; miniupnpc = miniupnpc_1;