Skip to content

Commit

Permalink
dosfstools: fix build failure in darwin
Browse files Browse the repository at this point in the history
Log of error: https://hydra.nixos.org/build/175255572/nixlog/1
Refs: ZHF NixOS#172160
Signed-off-by: Otavio Salvador <[email protected]>
  • Loading branch information
otavio committed May 9, 2022
1 parent e14ed19 commit 8272001
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion pkgs/tools/filesystems/dosfstools/default.nix
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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;

Expand Down

0 comments on commit 8272001

Please sign in to comment.