diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-11-15 22:18:52 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-15 22:18:52 -0500 |
commit | 06374747f7eb2d4c9183c3c03003a9e7e6e28001 (patch) | |
tree | f2a95e39311fa0af5034b75d832772dcc24fe9d3 /pkgs | |
parent | a04576f63c898c180ef35775ba1993d53af0786b (diff) | |
parent | d8b017f3d876691fc8c4b951ad6cfe85bcd5cd3f (diff) |
Merge pull request #146200 from veprbl/pr/rivet_3_1_5_fix
rivet: add a patch fix build
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/physics/rivet/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index b041dd483e1b6..9739530f8ba34 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -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 |