From c0fe996500b4e99742bb2ffd72a3bedd40e4dc7a Mon Sep 17 00:00:00 2001 From: Dave Nicponski Date: Mon, 13 Feb 2023 19:15:04 -0500 Subject: [PATCH] s3fs: fix build on darwin `s3fs` code uses two constants (UTIME_NOW and UTIME_OMIT) that were not defined in the darwin sdk headers until sdk version 10.13. --- pkgs/tools/filesystems/s3fs/default.nix | 1 - pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index d31e466331c0..58ef6442d8d0 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; description = "Mount an S3 bucket as filesystem through FUSE"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c6ac9a1a4ed..603777d59064 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11644,7 +11644,7 @@ with pkgs; s3bro = callPackage ../tools/admin/s3bro { }; - s3fs = callPackage ../tools/filesystems/s3fs { }; + s3fs = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/s3fs { }; s3cmd = python3Packages.callPackage ../tools/networking/s3cmd { };