From b151851760ef3a34de298c33301342ef55908e0c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 7 Sep 2024 16:23:42 +0200 Subject: [PATCH] net-snmp: fix building for musl Since autoreconfHook was added, fix-fd_mask.patch doesn't do anything, because it patches the configure script, which is now overwritten. Replace the Alpine patch with the upstream equivalent, which patches the m4 source of configure as well. Fixes: 5e6e3520df70 ("net-snmp: darwin support") --- pkgs/servers/monitoring/net-snmp/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 3f5c8c84701e..b7db5e56fd77 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchurl, fetchpatch , file, openssl, perl, nettools , autoreconfHook , withPerlTools ? false @@ -27,7 +27,11 @@ in stdenv.mkDerivation rec { in [ (fetchAlpinePatch "fix-includes.patch" "0zpkbb6k366qpq4dax5wknwprhwnhighcp402mlm7950d39zfa3m") (fetchAlpinePatch "netsnmp-swinst-crash.patch" "0gh164wy6zfiwiszh58fsvr25k0ns14r3099664qykgpmickkqid") - (fetchAlpinePatch "fix-fd_mask.patch" "/i9ve61HjDzqZt+u1wajNtSQoizl+KePvhcAt24HKd0=") + (fetchpatch { + name = "configure-musl.patch"; + url = "https://github.com/net-snmp/net-snmp/commit/a62169f1fa358be8f330ea8519ade0610fac525b.patch"; + hash = "sha256-+vWH095fFL3wE6XLsTaPXgMDya0LRWdlL6urD5AIBUs="; + }) ]; outputs = [ "bin" "out" "dev" "lib" ];