From b2ac303287e641fe5b130ce0891b2d7b69ea77d6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 10 Apr 2025 14:43:39 +0200
Subject: [PATCH] xrootd: 5.7.1 -> 5.8.0

Diff: https://github.com/xrootd/xrootd/compare/refs/tags/v5.7.1...refs/tags/v5.8.0

Changelog: https://github.com/xrootd/xrootd/releases/tag/v5.8.0
---
 pkgs/by-name/xr/xrootd/package.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xr/xrootd/package.nix b/pkgs/by-name/xr/xrootd/package.nix
index b36594aac04e..2e20a3a4e0b2 100644
--- a/pkgs/by-name/xr/xrootd/package.nix
+++ b/pkgs/by-name/xr/xrootd/package.nix
@@ -30,14 +30,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xrootd";
-  version = "5.7.1";
+  version = "5.8.0";
 
   src = fetchFromGitHub {
     owner = "xrootd";
     repo = "xrootd";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-ZU31nsQgs+Gz9mV8LVv4utJ7g8TXN5OxHjNDfQlt38M=";
+    hash = "sha256-i0gVKk2nFQQGxvUI2zqPWL82SFJdNglAuZ5gNdNhg2M=";
   };
 
   postPatch =
@@ -46,6 +46,17 @@ stdenv.mkDerivation (finalAttrs: {
       substituteInPlace cmake/XRootDConfig.cmake.in \
         --replace-fail "@PACKAGE_CMAKE_INSTALL_" "@CMAKE_INSTALL_FULL_"
     ''
+    # Upstream started using an absolute path in an install's DESTINATION directive.
+    # This causes our build to fail in `fixupPhase` with:
+    #   Moving /nix/store/jbh4667k5zm74h9wv8y1j11x89cv6pnd-xrootd-5.8.0/include to /nix/store/6vnmipw8p1hc6cmkrsq9v1ay7j6iycq2-xrootd-5.8.0-dev/include
+    #   mv: cannot overwrite '/nix/store/6vnmipw8p1hc6cmkrsq9v1ay7j6iycq2-xrootd-5.8.0-dev/include/xrootd': Directory not empty
+    # Patch submitted upstream: https://github.com/xrootd/xrootd/pull/2478
+    + ''
+      substituteInPlace src/XrdPfc.cmake \
+        --replace-fail \
+        'DESTINATION ''${CMAKE_INSTALL_PREFIX}/include/xrootd/XrdPfc' \
+        'DESTINATION ''${CMAKE_INSTALL_INCLUDEDIR}/xrootd/XrdPfc'
+    ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       sed -i cmake/XRootDOSDefs.cmake -e '/set( MacOSX TRUE )/ainclude( GNUInstallDirs )'
     '';