diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-14 13:45:54 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-14 13:45:54 +0200 |
commit | 8d56f2472e47a3f1f388b69c0ecc24421910d555 (patch) | |
tree | 6eabee7471ed3f7395156dc158a58205cca236f4 /pkgs/applications/science/physics | |
parent | 9bd78cb0488040ea996b27e82135396a45325af5 (diff) | |
parent | 930659b10bc7c875fd49b1cdae21a631b429c25a (diff) | |
download | nixlib-8d56f2472e47a3f1f388b69c0ecc24421910d555.tar nixlib-8d56f2472e47a3f1f388b69c0ecc24421910d555.tar.gz nixlib-8d56f2472e47a3f1f388b69c0ecc24421910d555.tar.bz2 nixlib-8d56f2472e47a3f1f388b69c0ecc24421910d555.tar.lz nixlib-8d56f2472e47a3f1f388b69c0ecc24421910d555.tar.xz nixlib-8d56f2472e47a3f1f388b69c0ecc24421910d555.tar.zst nixlib-8d56f2472e47a3f1f388b69c0ecc24421910d555.zip |
Merge master into staging-next
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}" |