File tree Expand file tree Collapse file tree 1 file changed +13
-2
lines changed Expand file tree Collapse file tree 1 file changed +13
-2
lines changed Original file line number Diff line number Diff line change 3030
3131stdenv . mkDerivation ( finalAttrs : {
3232 pname = "xrootd" ;
33- version = "5.7.1 " ;
33+ version = "5.8.0 " ;
3434
3535 src = fetchFromGitHub {
3636 owner = "xrootd" ;
3737 repo = "xrootd" ;
3838 tag = "v${ finalAttrs . version } " ;
3939 fetchSubmodules = true ;
40- hash = "sha256-ZU31nsQgs+Gz9mV8LVv4utJ7g8TXN5OxHjNDfQlt38M =" ;
40+ hash = "sha256-i0gVKk2nFQQGxvUI2zqPWL82SFJdNglAuZ5gNdNhg2M =" ;
4141 } ;
4242
4343 postPatch =
@@ -46,6 +46,17 @@ stdenv.mkDerivation (finalAttrs: {
4646 substituteInPlace cmake/XRootDConfig.cmake.in \
4747 --replace-fail "@PACKAGE_CMAKE_INSTALL_" "@CMAKE_INSTALL_FULL_"
4848 ''
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'
59+ ''
4960 + lib . optionalString stdenv . hostPlatform . isDarwin ''
5061 sed -i cmake/XRootDOSDefs.cmake -e '/set( MacOSX TRUE )/ainclude( GNUInstallDirs )'
5162 '' ;
You can’t perform that action at this time.
0 commit comments