From 9634bf5216c29531b9e85a4504a9108f0b440e70 Mon Sep 17 00:00:00 2001 From: Jonas Rembser Date: Fri, 14 Feb 2025 19:01:22 +0100 Subject: [PATCH] xrootd: disable features requiring isa-l if not available Follows up on d230a4e059c38b05dc4, which disable isa-l for a specific platform (aarch64-darwin). This makes xrootd and dependent packages like ROOT build again on Apple silicon. --- pkgs/by-name/xr/xrootd/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/xr/xrootd/package.nix b/pkgs/by-name/xr/xrootd/package.nix index 80ebf42778d5..b36594aac04e 100644 --- a/pkgs/by-name/xr/xrootd/package.nix +++ b/pkgs/by-name/xr/xrootd/package.nix @@ -68,7 +68,6 @@ stdenv.mkDerivation (finalAttrs: { [ davix curl - isa-l libkrb5 libuuid libxcrypt @@ -83,6 +82,7 @@ stdenv.mkDerivation (finalAttrs: { fuse ] ++ lib.filter (lib.meta.availableOn stdenv.hostPlatform) [ + isa-l # not available on Apple silicon systemd # only available on specific non-static Linux platforms voms # only available on Linux due to gsoap failing to build on Darwin ]; @@ -122,6 +122,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_SCITOKENS" true) (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "ENABLE_VOMS" stdenv.hostPlatform.isLinux) + (lib.cmakeBool "ENABLE_XRDEC" (lib.meta.availableOn stdenv.hostPlatform isa-l)) # requires isa-l ]; # TODO(@ShamrockLee): Enable the checks.