diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:20:49 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:23:16 +0000 |
| commit | 4999a38db7c5de0ea9f514a12ecd4133cce647f3 (patch) | |
| tree | bbb659ab07fda4c9b98053499b7e3f046ac6d5dc /nixpkgs/pkgs/development/libraries/physics/rivet | |
| parent | f9abd30e11337cf07034f2cc8ad1691aa4a69386 (diff) | |
| parent | 8746c77a383f5c76153c7a181f3616d273acfa2a (diff) | |
| download | nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.gz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.bz2 nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.lz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.xz nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.tar.zst nixlib-4999a38db7c5de0ea9f514a12ecd4133cce647f3.zip | |
Merge commit '8746c77a383f5c76153c7a181f3616d273acfa2a'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/physics/rivet')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/physics/rivet/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix b/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix index c8dae0c2b51a..c068424e416e 100644 --- a/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fastjet, ghostscript, gsl, hepmc, imagemagick, less, python2, texlive, yoda, which, makeWrapper }: +{ stdenv, fetchurl, fastjet, ghostscript, gsl, hepmc2, imagemagick, less, python2, texlive, yoda, which, makeWrapper }: stdenv.mkDerivation rec { name = "rivet-${version}"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { xkeyval xstring ;}; - buildInputs = [ hepmc imagemagick python2 latex makeWrapper ]; + buildInputs = [ hepmc2 imagemagick python2 latex makeWrapper ]; propagatedBuildInputs = [ fastjet ghostscript gsl yoda ]; preConfigure = '' @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-fastjet=${fastjet}" - "--with-hepmc=${hepmc}" + "--with-hepmc=${hepmc2}" "--with-yoda=${yoda}" ]; |