Unverified Commit 714e12c4 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #216252 from virusdave/virusdave/scratch/fix_s3fs_build_darwin 

s3fs: fix build on darwin
parents 047bd73c c0fe9965

pkgs/tools/filesystems/s3fs/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -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;

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -11658,7 +11658,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 { };