From a5b4e5b9d64c577853487fa6dbf8f93c2a4cd0bf Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Tue, 20 Dec 2022 12:57:05 +0800 Subject: [PATCH] xrootd: provide fuse support (xrootdfs) for Darwin --- pkgs/tools/networking/xrootd/default.nix | 2 +- pkgs/top-level/all-packages.nix | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix index 93683bc6f7fa..c6df60f2ee0f 100644 --- a/pkgs/tools/networking/xrootd/default.nix +++ b/pkgs/tools/networking/xrootd/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl + fuse libkrb5 libuuid libxcrypt @@ -56,7 +57,6 @@ stdenv.mkDerivation rec { zlib ] ++ lib.optionals stdenv.isLinux [ - fuse systemd voms ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46face91cab1..70363e3afc8a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1514,7 +1514,12 @@ with pkgs; xpaste = callPackage ../tools/text/xpaste { }; - xrootd = callPackage ../tools/networking/xrootd { }; + xrootd = callPackage ../tools/networking/xrootd { + fuse = + if hostPlatform.isDarwin then osxfuse + else if hostPlatform.isLinux then fuse + else null; + }; xtrt = callPackage ../tools/archivers/xtrt { };