Merge pull request #228615 from NixOS/revert-228588-root-darwin

Revert "root: fix build on aarch64-darwin"
This commit is contained in:
Weijia Wang
2023-04-28 01:42:40 +03:00
committed by GitHub
@@ -208,9 +208,6 @@ stdenv.mkDerivation rec {
# fatal error: module map file '/nix/store/<hash>-Libsystem-osx-10.12.6/include/module.modulemap' not found
# fatal error: could not build module '_Builtin_intrinsics'
"-Druntime_cxxmodules=OFF"
# At least C++17 standard required with root7
"-DCMAKE_CXX_STANDARD=17"
];
# Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}.