mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-01 01:57:37 +03:00
Revert "xrootd: provide fuse support (xrootdfs) for Darwin and fix the tests"
This commit is contained in:
parent
89fae351e4
commit
d9dec0c418
@ -37,11 +37,6 @@ stdenv.mkDerivation rec {
|
|||||||
outputs = [ "bin" "out" "dev" "man" ];
|
outputs = [ "bin" "out" "dev" "man" ];
|
||||||
|
|
||||||
passthru.tests = lib.optionalAttrs enableTests {
|
passthru.tests = lib.optionalAttrs enableTests {
|
||||||
test-xrdcp = callPackage ./test-xrdcp.nix {
|
|
||||||
url = "root://eospublic.cern.ch//eos/opendata/alice/2010/LHC10h/000138275/ESD/0000/AliESDs.root";
|
|
||||||
hash = "sha256-tIcs2oi+8u/Qr+P7AAaPTbQT+DEt26gEdc4VNerlEHY=";
|
|
||||||
};
|
|
||||||
} // lib.optionalAttrs stdenv.isLinux {
|
|
||||||
test-runner = callPackage ./test-runner.nix { };
|
test-runner = callPackage ./test-runner.nix { };
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -52,7 +47,6 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
curl
|
curl
|
||||||
fuse
|
|
||||||
libkrb5
|
libkrb5
|
||||||
libuuid
|
libuuid
|
||||||
libxcrypt
|
libxcrypt
|
||||||
@ -62,6 +56,7 @@ stdenv.mkDerivation rec {
|
|||||||
zlib
|
zlib
|
||||||
]
|
]
|
||||||
++ lib.optionals stdenv.isLinux [
|
++ lib.optionals stdenv.isLinux [
|
||||||
|
fuse
|
||||||
systemd
|
systemd
|
||||||
voms
|
voms
|
||||||
]
|
]
|
||||||
|
@ -1,19 +0,0 @@
|
|||||||
{ lib
|
|
||||||
, runCommandLocal
|
|
||||||
, buildPlatform
|
|
||||||
, xrootd
|
|
||||||
, url
|
|
||||||
, hash
|
|
||||||
}: runCommandLocal (baseNameOf url)
|
|
||||||
{
|
|
||||||
nativeBuildInputs = [ xrootd ];
|
|
||||||
outputHashAlgo = null;
|
|
||||||
outputHashMode = "flat";
|
|
||||||
outputHash = hash;
|
|
||||||
inherit url;
|
|
||||||
}
|
|
||||||
# Set [DY]LD_LIBRARY_PATH to workaround #169677
|
|
||||||
# TODO: Remove the library path after #200830 get merged
|
|
||||||
''
|
|
||||||
${lib.optionalString buildPlatform.isDarwin "DY"}LD_LIBRARY_PATH=${lib.makeLibraryPath [ xrootd ]} xrdcp --force "$url" "$out"
|
|
||||||
''
|
|
@ -1601,12 +1601,7 @@ with pkgs;
|
|||||||
|
|
||||||
xpaste = callPackage ../tools/text/xpaste { };
|
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 { };
|
xtrt = callPackage ../tools/archivers/xtrt { };
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user