xrootd: 5.7.1 -> 5.8.0 (#397667)

authored by Gaétan Lepage and committed by GitHub 9312209e 5c43b007

+13 -2
+13 -2
pkgs/by-name/xr/xrootd/package.nix
··· 30 30 31 31 stdenv.mkDerivation (finalAttrs: { 32 32 pname = "xrootd"; 33 - version = "5.7.1"; 33 + version = "5.8.0"; 34 34 35 35 src = fetchFromGitHub { 36 36 owner = "xrootd"; 37 37 repo = "xrootd"; 38 38 tag = "v${finalAttrs.version}"; 39 39 fetchSubmodules = true; 40 - hash = "sha256-ZU31nsQgs+Gz9mV8LVv4utJ7g8TXN5OxHjNDfQlt38M="; 40 + hash = "sha256-i0gVKk2nFQQGxvUI2zqPWL82SFJdNglAuZ5gNdNhg2M="; 41 41 }; 42 42 43 43 postPatch = ··· 45 45 patchShebangs genversion.sh 46 46 substituteInPlace cmake/XRootDConfig.cmake.in \ 47 47 --replace-fail "@PACKAGE_CMAKE_INSTALL_" "@CMAKE_INSTALL_FULL_" 48 + '' 49 + # Upstream started using an absolute path in an install's DESTINATION directive. 50 + # This causes our build to fail in `fixupPhase` with: 51 + # Moving /nix/store/jbh4667k5zm74h9wv8y1j11x89cv6pnd-xrootd-5.8.0/include to /nix/store/6vnmipw8p1hc6cmkrsq9v1ay7j6iycq2-xrootd-5.8.0-dev/include 52 + # mv: cannot overwrite '/nix/store/6vnmipw8p1hc6cmkrsq9v1ay7j6iycq2-xrootd-5.8.0-dev/include/xrootd': Directory not empty 53 + # Patch submitted upstream: https://github.com/xrootd/xrootd/pull/2478 54 + + '' 55 + substituteInPlace src/XrdPfc.cmake \ 56 + --replace-fail \ 57 + 'DESTINATION ''${CMAKE_INSTALL_PREFIX}/include/xrootd/XrdPfc' \ 58 + 'DESTINATION ''${CMAKE_INSTALL_INCLUDEDIR}/xrootd/XrdPfc' 48 59 '' 49 60 + lib.optionalString stdenv.hostPlatform.isDarwin '' 50 61 sed -i cmake/XRootDOSDefs.cmake -e '/set( MacOSX TRUE )/ainclude( GNUInstallDirs )'