Unverified Commit b38feaef authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

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

Revert "root: fix build on aarch64-darwin"
parents 8345e617 af661f3b

pkgs/applications/science/misc/root/default.nix

+0 −3
Original line number Diff line number Diff line
@@ -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}.