cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

pythia: add hepmc3 support

Browse source
This commit is contained in:
Dmitry Kalinkin 2020-10-07 22:41:30 -04:00
parent b0486f3171
commit 72e7d87b01
No known key found for this signature in database
GPG key ID: 5157B3EC8B2CA333
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/libraries/physics/pythia/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, boost, fastjet, hepmc2, lhapdf, rsync, zlib }: { stdenv, fetchurl, boost, fastjet, hepmc, lhapdf, rsync, zlib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pythia"; pname = "pythia";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0gli6zf8931i7kyminppisc9d0q69xxnalvhld5fgnkh4q82nz6d"; sha256 = "0gli6zf8931i7kyminppisc9d0q69xxnalvhld5fgnkh4q82nz6d";
}; };
buildInputs = [ boost fastjet hepmc2 zlib rsync lhapdf ]; buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ];
preConfigure = '' preConfigure = ''
patchShebangs ./configure patchShebangs ./configure
@ -17,9 +17,12 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--enable-shared" "--enable-shared"
"--with-hepmc2=${hepmc2}"
"--with-lhapdf6=${lhapdf}" "--with-lhapdf6=${lhapdf}"
]; ] ++ (if stdenv.lib.versions.major hepmc.version == "3" then [
"--with-hepmc3=${hepmc}"
] else [
"--with-hepmc2=${hepmc}"
]);
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/top-level/all-packages.nix
View file

@ -26755,7 +26755,9 @@ in
nlojet = callPackage ../development/libraries/physics/nlojet { }; nlojet = callPackage ../development/libraries/physics/nlojet { };
pythia = callPackage ../development/libraries/physics/pythia { }; pythia = callPackage ../development/libraries/physics/pythia {
hepmc = hepmc2;
};
rivet = callPackage ../development/libraries/physics/rivet { rivet = callPackage ../development/libraries/physics/rivet {
hepmc = hepmc2; hepmc = hepmc2;