diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/development/libraries/libnatpmp | |
parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libnatpmp')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libnatpmp/default.nix | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix b/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix index f718170fc76c..49e89b97344b 100644 --- a/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix @@ -1,15 +1,27 @@ -{ lib, stdenv, fetchurl, fixDarwinDylibNames }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, fixDarwinDylibNames +}: stdenv.mkDerivation rec { pname = "libnatpmp"; - version = "20150609"; + version = "20230423"; src = fetchurl { - name = "${pname}-${version}.tar.gz"; - url = "http://miniupnp.free.fr/files/download.php?file=${pname}-${version}.tar.gz"; - sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1"; + url = "https://miniupnp.tuxfamily.org/files/${pname}-${version}.tar.gz"; + 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)" |