rivet: 2.6.2 -> 2.7.0

This commit is contained in:
Dmitry Kalinkin 2019-02-18 12:42:40 -05:00
parent 0ea514f58f
commit 78d041f6a9

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rivet-${version}"; name = "rivet-${version}";
version = "2.6.2"; version = "2.7.0";
src = fetchurl { src = fetchurl {
url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
sha256 = "0yp3mllr2b4bhsmixjmmpl2n4x78bgw74a9xy2as4f10q3alkplx"; sha256 = "12mlj2j1glidjhiaxlr25qz2vfb865wip1vwwg8vlyd3yzisf533";
}; };
patches = [ patches = [
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
substituteInPlace analyses/Makefile.in \ substituteInPlace analyses/Makefile.in \
--replace "!(tmp)" "" --replace "!(tmp)" ""
substituteInPlace bin/rivet-buildplugin.in \ substituteInPlace bin/rivet-buildplugin.in \
--replace '"which"' '"${which}/bin/which"' \ --replace 'which' '"${which}/bin/which"' \
--replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"} #' \ --replace 'mycxx=' 'mycxx=${stdenv.cc}/bin/${if stdenv.cc.isClang or false then "clang++" else "g++"} #' \
--replace 'mycxxflags="' "mycxxflags=\"-std=c++11 $NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK " --replace 'mycxxflags="' "mycxxflags=\"-std=c++11 $NIX_CFLAGS_COMPILE $NIX_CXXSTDLIB_COMPILE $NIX_CFLAGS_LINK "
''; '';