summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-01-20 21:09:33 +0000
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-01-23 21:12:42 +0000
commit9c8517d48de5cf539734c10bed2288b5f766e670 (patch)
tree799c5bdcaf474ca150db28aa6b8b1762e54dfd0f
parentMerge pull request #212244 from zlalanne/release-22.11 (diff)
downloadnixpkgs-origin/backport-212182-to-release-22.11.tar.gz
dosfstools: fix build for FreeBSDorigin/backport-212182-to-release-22.11
(cherry picked from commit c0762a8dee60f5bbfc477b38a0f218ca33a7e03a)
-rw-r--r--pkgs/tools/filesystems/dosfstools/default.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index e15b4ad1f645..95d18c6e78c6 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -12,12 +12,16 @@ stdenv.mkDerivation rec {
};
patches = [
- # macOS build fixes backported from master
+ # macOS and FreeBSD 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=";
})
+ (fetchpatch {
+ url = "https://github.com/dosfstools/dosfstools/commit/2d3125c4a74895eae1f66b93287031d340324524.patch";
+ sha256 = "nlIuRDsNjk23MKZL9cZ05odOfTXvsyQaKcv/xEr4c+U=";
+ })
];
nativeBuildInputs = [ autoreconfHook pkg-config ]
@@ -37,7 +41,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Utilities for creating and checking FAT and VFAT file systems";
homepage = "https://github.com/dosfstools/dosfstools";
- platforms = lib.platforms.linux ++ lib.platforms.darwin;
+ platforms = lib.platforms.unix;
license = lib.licenses.gpl3;
};
}