dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #136369 from veprbl/pr/root5_gcc10_fix

Browse Source 
root5: fix for gcc10
This commit is contained in:
Guillaume Girol 2021-09-10 19:54:29 +00:00 committed by GitHub
commit 1065a41d8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/science/misc/root/5.nix
View File

@ -47,6 +47,17 @@ stdenv.mkDerivation rec {
# disable dictionary generation for stuff that includes libc headers
# our glibc requires a modern compiler
./disable_libc_dicts_root5.patch
(fetchpatch {
name = "root5-gcc9-fix.patch";
url = "https://github.com/root-project/root/commit/348f30a6a3b5905ef734a7bd318bc0ee8bca6dc9.diff";
sha256 = "0dvrsrkpacyn5z87374swpy7aciv9a8s6m61b4iqd7a956r67rn3";
})
(fetchpatch {
name = "root5-gcc10-fix.patch";
url = "https://github.com/root-project/root/commit/3c243b18768d3c3501faf3ca4e4acfc071021350.diff";
sha256 = "1hjmgnp4zx6im8ps78673x0rrhmfyy1nffhgxjlfl1r2z8cq210z";
})
];
preConfigure = ''

2
pkgs/top-level/all-packages.nix
View File

@ -31289,7 +31289,7 @@ with pkgs;
root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else gcc8Stdenv;
stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
});
rink = callPackage ../applications/science/misc/rink {