root5: fix for gcc10

+12 -1
+11
pkgs/applications/science/misc/root/5.nix
··· 47 47 # disable dictionary generation for stuff that includes libc headers 48 48 # our glibc requires a modern compiler 49 49 ./disable_libc_dicts_root5.patch 50 + 51 + (fetchpatch { 52 + name = "root5-gcc9-fix.patch"; 53 + url = "https://github.com/root-project/root/commit/348f30a6a3b5905ef734a7bd318bc0ee8bca6dc9.diff"; 54 + sha256 = "0dvrsrkpacyn5z87374swpy7aciv9a8s6m61b4iqd7a956r67rn3"; 55 + }) 56 + (fetchpatch { 57 + name = "root5-gcc10-fix.patch"; 58 + url = "https://github.com/root-project/root/commit/3c243b18768d3c3501faf3ca4e4acfc071021350.diff"; 59 + sha256 = "1hjmgnp4zx6im8ps78673x0rrhmfyy1nffhgxjlfl1r2z8cq210z"; 60 + }) 50 61 ]; 51 62 52 63 preConfigure = ''
+1 -1
pkgs/top-level/all-packages.nix
··· 31189 31189 31190 31190 root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix { 31191 31191 inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; 31192 - stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else gcc8Stdenv; 31192 + stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; 31193 31193 }); 31194 31194 31195 31195 rink = callPackage ../applications/science/misc/rink {