From 5e3e3e985d9046b661b79fec99d657578525d37a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 24 Mar 2018 13:30:33 -0500 Subject: [PATCH] netcat-openbsd: fix w/musl by providing b64_ntop It seems many projects have copies of this code-- and AFAICT all are derived from ISC's BIND[2] although it does not appear present in recent versions. This is a curious function as it is not documented nor part of any standard[1]. [1] https://www.lemoda.net/unix/base64/index.html [2] for example, glibc's copy: https://sourceware.org/git/?p=glibc.git;a=blob;f=resolv/README;h=514e9bb617e710f16126c1474561965a2b35653d;hb=HEAD#l104 --- pkgs/tools/networking/netcat-openbsd/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix index 8c9247013778..2d9776abfcfc 100644 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, libbsd}: +{stdenv, fetchurl, fetchpatch, pkgconfig, libbsd}: stdenv.mkDerivation rec { version = "1.187"; @@ -27,6 +27,13 @@ stdenv.mkDerivation rec { done ''; + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [ + (fetchpatch { + url = "https://gitweb.gentoo.org/proj/musl.git/plain/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-b64_ntop.patch?id=4a5864922232c7df550c21f2a7b77fe6f8ffc6d6"; + sha256 = "1cgqb6fxas5yiwf26hq57v627hhmcskl5j6rx30090ha2ksjqyvr"; + }) + ]; + installPhase = '' runHook preInstall install -Dm0755 nc $out/bin/nc