Skip to content

Commit 8d753f4

Browse files
authored
xrootd: disable features requiring isa-l if not available (#382105)
2 parents 12c8eca + 9634bf5 commit 8d753f4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

pkgs/by-name/xr/xrootd/package.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ stdenv.mkDerivation (finalAttrs: {
6868
[
6969
davix
7070
curl
71-
isa-l
7271
libkrb5
7372
libuuid
7473
libxcrypt
@@ -83,6 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
8382
fuse
8483
]
8584
++ lib.filter (lib.meta.availableOn stdenv.hostPlatform) [
85+
isa-l # not available on Apple silicon
8686
systemd # only available on specific non-static Linux platforms
8787
voms # only available on Linux due to gsoap failing to build on Darwin
8888
];
@@ -122,6 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
122122
(lib.cmakeBool "ENABLE_SCITOKENS" true)
123123
(lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
124124
(lib.cmakeBool "ENABLE_VOMS" stdenv.hostPlatform.isLinux)
125+
(lib.cmakeBool "ENABLE_XRDEC" (lib.meta.availableOn stdenv.hostPlatform isa-l)) # requires isa-l
125126
];
126127

127128
# TODO(@ShamrockLee): Enable the checks.

0 commit comments

Comments
 (0)