diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2017-01-09 09:58:22 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-09 09:58:22 +0000 |
commit | 39ed261c4cf97e5f620e852ea8fae377d565d723 (patch) | |
tree | c7633ee19a05b9d9a6d36398021cb941ec1abab0 /pkgs/applications | |
parent | e2b30dc0f9d129074e2d31e5b9759f2a47de9e72 (diff) | |
parent | f7173a9187ceb907a63b5e9a458c746ec055a3b3 (diff) | |
download | nixlib-39ed261c4cf97e5f620e852ea8fae377d565d723.tar nixlib-39ed261c4cf97e5f620e852ea8fae377d565d723.tar.gz nixlib-39ed261c4cf97e5f620e852ea8fae377d565d723.tar.bz2 nixlib-39ed261c4cf97e5f620e852ea8fae377d565d723.tar.lz nixlib-39ed261c4cf97e5f620e852ea8fae377d565d723.tar.xz nixlib-39ed261c4cf97e5f620e852ea8fae377d565d723.tar.zst nixlib-39ed261c4cf97e5f620e852ea8fae377d565d723.zip |
Merge pull request #21632 from veprbl/sherpa_fix
sherpa: fix sqlite dependency
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/science/physics/sherpa/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index d863964ad90a..e815ddfc1c2f 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, sqlite }: +{ stdenv, fetchurl, gfortran, hepmc, fastjet, lhapdf, rivet, sqlite }: stdenv.mkDerivation rec { name = "sherpa-${version}"; @@ -9,10 +9,20 @@ stdenv.mkDerivation rec { sha256 = "13vkz6w8kqyv8sgy3mxnlps5ykml5rnlj50vjj0pp9rgbl5y8ali"; }; - buildInputs = [ gfortran sqlite ]; + buildInputs = [ gfortran sqlite lhapdf rivet ]; enableParallelBuilding = true; + configureFlags = [ + "--with-sqlite3=${sqlite.dev}" + "--enable-hepmc2=${hepmc}" + "--enable-fastjet=${fastjet}" + "--enable-lhapdf=${lhapdf}" + "--enable-rivet=${rivet}" + ]; + + CXXFLAGS = "-std=c++11"; # needed for rivet on OSX + meta = { description = "Simulation of High-Energy Reactions of PArticles in lepton-lepton, lepton-photon, photon-photon, lepton-hadron and hadron-hadron collisions"; license = stdenv.lib.licenses.gpl2; |