public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39577 from veprbl/pr/pythia_8.235

Browse Source 
pythia: 8.226 -> 8.235, enable lhapdf6 plugin
This commit is contained in:
Jörg Thalheim 2018-04-28 11:44:37 +01:00 committed by GitHub
commit 68e75fbb53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/science/physics/sacrifice/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, boost, hepmc, lhapdf, pythia }: { stdenv, fetchurl, boost, hepmc, lhapdf, pythia, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sacrifice-${version}"; name = "sacrifice-${version}";
@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ boost hepmc lhapdf pythia ]; buildInputs = [ boost hepmc lhapdf pythia ];
nativeBuildInputs = [ makeWrapper ];
patches = [ patches = [
./compat.patch ./compat.patch
@ -27,8 +28,11 @@ stdenv.mkDerivation rec {
"--with-pythia=${pythia}" "--with-pythia=${pythia}"
]; ];
postInstall = stdenv.lib.optionalString stdenv.isDarwin '' postInstall = if stdenv.isDarwin then ''
install_name_tool -add_rpath ${pythia}/lib "$out"/bin/run-pythia install_name_tool -add_rpath ${pythia}/lib "$out"/bin/run-pythia
'' else ''
wrapProgram $out/bin/run-pythia \
--prefix LD_LIBRARY_PATH : "${pythia}/lib"
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;

5
pkgs/development/libraries/physics/pythia/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pythia-${version}"; name = "pythia-${version}";
version = "8.226"; version = "8.235";
src = fetchurl { src = fetchurl {
url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz";
sha256 = "1jfjkq78d1llrrm2k5pgsl92a5z8af9rx3n83rzv28lxrqdjix4g"; sha256 = "17cfgs7v469pdnnzvlmdagcdhi0h419znqmaws90l9d8cmhhsbz8";
}; };
buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ]; buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ];
@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--enable-shared" "--enable-shared"
"--with-hepmc2=${hepmc}" "--with-hepmc2=${hepmc}"
"--with-lhapdf6=${lhapdf}"
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;