From 0285b6ff0f25247a62a018416ca4a270a8f6da7c Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Fri, 15 Jul 2022 10:34:48 +0800 Subject: [PATCH] lsof: fix -fno-common builds on darwin Two upstream commits are applied for -fno-common toolchains. Signed-off-by: Jiajie Chen --- pkgs/development/tools/misc/lsof/default.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index 4c632667c229..9cf752af5b8f 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -18,6 +18,20 @@ stdenv.mkDerivation rec { patches = [ ./no-build-info.patch + + # Pull upstream fix for -fno-common toolchains: + # https://github.com/lsof-org/lsof/pull/226 + # https://github.com/lsof-org/lsof/pull/233 + (fetchpatch { + name = "add-extern.patch"; + url = "https://github.com/lsof-org/lsof/commit/180ffa29b0544f77cabbc54d7f77d50d33dd27d7.patch"; + sha256 = "sha256-zzcN9HrFYMTBeEekeAwi2RIcVukymgaqtpvFIBV6njU="; + }) + (fetchpatch { + name = "add-declaration.patch"; + url = "https://github.com/lsof-org/lsof/commit/8e47e1491636e8cf41baf834554391be45177b00.patch"; + sha256 = "sha256-kwkDQp7VApLenOLTPMY24Me+/xUhD56skHWRd4ZB1I4="; + }) ]; postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''