diff options
| author | veprbl <dmitry.kalinkin@gmail.com> | 2022-04-19 14:56:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-19 14:56:09 -0400 |
| commit | 2511bad8aaf4d4de1f7a896683e92ed432eb8740 (patch) | |
| tree | f3b3b2abac7b5f5a4088530ced43f9763ea200b0 | |
| parent | e56192d840768a1e7cc9d66ea0e533d728fbc55b (diff) | |
| parent | 81f9e288444b9c01c5cef2bf1e9173adf6a25f5a (diff) | |
Merge pull request #168973 from veprbl/pr/root5_glibc_fix
root5: fix for glibc
| -rw-r--r-- | pkgs/applications/science/misc/root/5.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index de85043f127e0..40a5412e7af77 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -85,6 +85,11 @@ stdenv.mkDerivation rec { patchShebangs build/unix/ ln -s ${lib.getDev stdenv.cc.libc}/include/AvailabilityMacros.h cint/cint/include/ + + # __malloc_hook is deprecated + substituteInPlace misc/memstat/src/TMemStatHook.cxx \ + --replace "defined(R__GNU) && (defined(R__LINUX) || defined(__APPLE__))" \ + "defined(R__GNU) && (defined(__APPLE__))" '' # Fix CINTSYSDIR for "build" version of rootcint # This is probably a bug that breaks out-of-source builds |