Merge pull request #146200 from veprbl/pr/rivet_3_1_5_fix

rivet: add a patch fix build
This commit is contained in:
Dmitry Kalinkin 2021-11-15 22:18:52 -05:00 committed by GitHub
commit 06374747f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }:
{ lib, stdenv, fetchurl, fetchpatch, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }:
stdenv.mkDerivation rec {
pname = "rivet";
@ -9,6 +9,15 @@ stdenv.mkDerivation rec {
hash = "sha256-YhcXW3gab7z3EJd3qGePeplVEapV4a5WKIc151hQXZo=";
};
patches = [
# Fixes build
(fetchpatch {
name = "rivet-3.1.5-namespace-fix.patch";
url = "https://gitlab.com/hepcedar/rivet/-/commit/17a99b38b52e65a4a3fd6289124bd9dd874c30bf.diff";
sha256 = "sha256-OknqghpMMB5nRHeeRc2ddxybhnkVGRB1x8jfOjrkyms=";
})
];
latex = texlive.combine { inherit (texlive)
scheme-basic
collection-pstricks