mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 05:31:22 +00:00
rivet: 2.7.0 -> 2.7.1
This commit is contained in:
parent
b98faf680c
commit
984e0e8c1d
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rivet-${version}";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
|
||||
sha256 = "007rwal8wx2k9gs0r6kym6ix0siz0x9l55q9myq41siirpf2jcpv";
|
||||
sha256 = "0ybv5dl3blgk9p9ayhknirxb6504kpygnkmizd5dr9ippys1i3c8";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -28,6 +28,10 @@ stdenv.mkDerivation rec {
|
|||
propagatedBuildInputs = [ fastjet ghostscript gsl yoda ];
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace Makefile.in \
|
||||
--replace "SUBDIRS = src pyext data include bin analyses doc test" "SUBDIRS = src pyext data include bin analyses test"
|
||||
substituteInPlace analyses/Makefile.in \
|
||||
--replace "!(tmp)" ""
|
||||
substituteInPlace bin/rivet-buildplugin.in \
|
||||
--replace '"which"' '"${which}/bin/which"' \
|
||||
--replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"} #' \
|
||||
|
|
Loading…
Reference in a new issue