From 8272001820315b42eb12895f6049c9fa8fbe2770 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 9 May 2022 12:54:01 -0300 Subject: [PATCH] dosfstools: fix build failure in darwin Log of error: https://hydra.nixos.org/build/175255572/nixlog/1 Refs: ZHF #172160 Signed-off-by: Otavio Salvador --- pkgs/tools/filesystems/dosfstools/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index 75a39fdfe92..e15b4ad1f64 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libiconv, gettext, xxd }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libiconv, gettext, xxd }: stdenv.mkDerivation rec { pname = "dosfstools"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-2gxB0lQixiHOHw8uTetHekaM57fvUd9zOzSxWnvUz/c="; }; + patches = [ + # macOS build fixes backported from master + # TODO: remove on the next release + (fetchpatch { + url = "https://github.com/dosfstools/dosfstools/commit/77ffb87e8272760b3bb2dec8f722103b0effb801.patch"; + sha256 = "sha256-xHxIs3faHK/sK3vAVoG8JcTe4zAV+ZtkozWIIFBvPWI="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optional stdenv.isDarwin libiconv;