diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-14 13:46:33 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-14 13:46:33 +0200 |
| commit | cff9e6429a4341e924594f5e057b03ca8101b314 (patch) | |
| tree | f8c1a31c9ad11b4c417b9c331747f3b3dc47bdf4 /pkgs/applications/science/physics | |
| parent | a6055b7d8705d3c3a008e67cde1d43cf5727f76b (diff) | |
| parent | 8d56f2472e47a3f1f388b69c0ecc24421910d555 (diff) | |
| download | nixlib-cff9e6429a4341e924594f5e057b03ca8101b314.tar nixlib-cff9e6429a4341e924594f5e057b03ca8101b314.tar.gz nixlib-cff9e6429a4341e924594f5e057b03ca8101b314.tar.bz2 nixlib-cff9e6429a4341e924594f5e057b03ca8101b314.tar.lz nixlib-cff9e6429a4341e924594f5e057b03ca8101b314.tar.xz nixlib-cff9e6429a4341e924594f5e057b03ca8101b314.tar.zst nixlib-cff9e6429a4341e924594f5e057b03ca8101b314.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/science/physics')
| -rw-r--r-- | pkgs/applications/science/physics/sacrifice/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/science/physics/sherpa/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index 64b88dcc3d4f..d43a05f1c616 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, hepmc, lhapdf, pythia, makeWrapper }: +{ stdenv, fetchurl, boost, hepmc2, lhapdf, pythia, makeWrapper }: stdenv.mkDerivation rec { name = "sacrifice-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "10bvpq63kmszy1habydwncm0j1dgvam0fkrmvkgbkvf804dcjp6g"; }; - buildInputs = [ boost hepmc lhapdf pythia ]; + buildInputs = [ boost hepmc2 lhapdf pythia ]; nativeBuildInputs = [ makeWrapper ]; patches = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-HepMC=${hepmc}" + "--with-HepMC=${hepmc2}" "--with-pythia=${pythia}" ]; diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index 7cb3e8881caf..1d61c612563f 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, hepmc, fastjet, lhapdf, rivet, sqlite }: +{ stdenv, fetchurl, gfortran, hepmc2, fastjet, lhapdf, rivet, sqlite }: stdenv.mkDerivation rec { name = "sherpa-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-sqlite3=${sqlite.dev}" - "--enable-hepmc2=${hepmc}" + "--enable-hepmc2=${hepmc2}" "--enable-fastjet=${fastjet}" "--enable-lhapdf=${lhapdf}" "--enable-rivet=${rivet}" |