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

geant4: 10.7.0 -> 10.7.1

This commit is contained in:
Michael Reilly 2021-02-20 13:17:15 -05:00
parent 2dd1c214ba
commit 312bc73b22
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/physics/geant4/datasets.nix
View File

@ -70,8 +70,8 @@ in
{ {
name = "G4PARTICLEXS"; name = "G4PARTICLEXS";
version = "3.1"; version = "3.1.1";
sha256 = "1kg9y0kqn4lma7b0yjpgj7s9n317yqi54ydvq365qphnmm7ahka0"; sha256 = "1nmgy8w1s196php7inrkbsi0f690qa2dsyj9s1sp75mndkfpxhb6";
envvar = "PARTICLEXS"; envvar = "PARTICLEXS";
} }

17
pkgs/development/libraries/physics/geant4/default.nix
View File

@ -21,6 +21,7 @@
# For enableQT. # For enableQT.
, qtbase , qtbase
, wrapQtAppsHook
# For enableXM. # For enableXM.
, motif , motif
@ -48,12 +49,12 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "10.7.0"; version = "10.7.1";
pname = "geant4"; pname = "geant4";
src = fetchurl{ src = fetchurl{
url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.tar.gz"; url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.p01.tar.gz";
sha256 = "0jmdxb8z20d4l6sf2w0gk9ska48kylm38yngy3mzyvyj619a8vkp"; sha256 = "07if874aljizkjyp21qj6v193pmyifyfmwi5kg8jm71x79sn2laj";
}; };
boost_python_lib = "python${builtins.replaceStrings ["."] [""] python3.pythonVersion}"; boost_python_lib = "python${builtins.replaceStrings ["."] [""] python3.pythonVersion}";
@ -87,7 +88,13 @@ stdenv.mkDerivation rec {
"-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so" "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so"
]; ];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [
cmake
] ++ lib.optionals enableQT [
wrapQtAppsHook
];
dontWrapQtApps = !enableQT;
buildInputs = [ libGLU xlibsWrapper libXmu ] buildInputs = [ libGLU xlibsWrapper libXmu ]
++ lib.optionals enableInventor [ libXpm coin3d soxt motif ] ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ]
@ -101,6 +108,8 @@ stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
# Don't try to export invalid environment variables. # Don't try to export invalid environment variables.
sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh
'' + lib.optionalString enableQT ''
wrapQtAppsHook
''; '';
setupHook = ./geant4-hook.sh; setupHook = ./geant4-hook.sh;