diff options
| author | Gaetan Lepage <gaetan@glepage.com> | 2024-02-01 09:19:28 +0100 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2024-02-13 16:45:54 -0500 |
| commit | 7b9e11995df355b1fab5d116441c43f9515084f5 (patch) | |
| tree | 256d1b9e78d100eb2d7f78199cb4618bdad7cb81 /pkgs/applications/science/misc | |
| parent | d0977f36f9376b57a8868beb5433ed373ce723a2 (diff) | |
xrootd: 5.5.5 -> 5.6.6
Changelog: https://github.com/xrootd/xrootd/releases/tag/v5.6.6 Structured attrs don't work with cmakeFlags - only first item is passed. Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Diffstat (limited to 'pkgs/applications/science/misc')
| -rw-r--r-- | pkgs/applications/science/misc/root/default.nix | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index c5534c18d7bbb..7c9d6f5cb0a66 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -2,6 +2,7 @@ , lib , callPackage , fetchurl +, fetchpatch , makeWrapper , cmake , coreutils @@ -109,6 +110,17 @@ stdenv.mkDerivation rec { patches = [ ./sw_vers.patch + + # compatibility with recent XRootD + # https://github.com/root-project/root/pull/13752 + (fetchpatch { + url = "https://github.com/root-project/root/commit/3d3cda6c520791282298782189cdb8ca07ace4b9.diff"; + hash = "sha256-O3aXzrOEQiPjZgbAj9TL6Wt/adN1kKFwjooeaFRyT4I="; + }) + (fetchpatch { + url = "https://github.com/root-project/root/commit/6e7798e62dbed1ffa8b91a180fa5a080b7c04ba3.diff"; + hash = "sha256-47/J631DBnVlvM1Pm9iicKXDKAqN8v9hjAstQuHmH8Q="; + }) ]; preConfigure = '' |