Merge pull request #216625 from NixOS/backport-216252-to-release-22.11

[Backport release-22.11] s3fs: fix build on darwin
This commit is contained in:
Weijia Wang
2023-02-16 12:23:02 +01:00
committed by GitHub
2 changed files with 1 additions and 2 deletions

View File

@@ -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;

View File

@@ -11182,7 +11182,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 { };