From 7d7d7c754d886369a7dbc66d34a11344f00dbc7c Mon Sep 17 00:00:00 2001 From: Michael Livshin Date: Mon, 26 Jun 2023 12:52:05 +0300 Subject: [PATCH] libnatpmp: fix install Import an upstream patch (which actually predates 2023-04-23!) to install natpmp_declspec.h, so that users of this library can be built. --- pkgs/development/libraries/libnatpmp/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix index 8841de12f9a..49e89b97344 100644 --- a/pkgs/development/libraries/libnatpmp/default.nix +++ b/pkgs/development/libraries/libnatpmp/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, fixDarwinDylibNames }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, fixDarwinDylibNames +}: stdenv.mkDerivation rec { pname = "libnatpmp"; @@ -9,6 +14,14 @@ stdenv.mkDerivation rec { hash = "sha256-BoTtLIQGQ351GaG9IOqDeA24cbOjpddSMRuj6Inb/HA="; }; + patches = [ + # install natpmp_declspec.h too, else nothing that uses this library will build + (fetchpatch { + url = "https://github.com/miniupnp/libnatpmp/commit/5f4a7c65837a56e62c133db33c28cd1ea71db662.patch"; + hash = "sha256-tvoGFmo5AzUgb40bIs/EzikE0ex1SFzE5peLXhktnbc="; + }) + ]; + makeFlags = [ "INSTALLPREFIX=$(out)" "CC:=$(CC)"