diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix index 5646f4e02ba..4c6906c9c2e 100644 --- a/pkgs/development/libraries/physics/geant4/datasets.nix +++ b/pkgs/development/libraries/physics/geant4/datasets.nix @@ -70,8 +70,8 @@ in { name = "G4PARTICLEXS"; - version = "3.1"; - sha256 = "1kg9y0kqn4lma7b0yjpgj7s9n317yqi54ydvq365qphnmm7ahka0"; + version = "3.1.1"; + sha256 = "1nmgy8w1s196php7inrkbsi0f690qa2dsyj9s1sp75mndkfpxhb6"; envvar = "PARTICLEXS"; } diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 159c746fecd..8d2f2f1ef55 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -21,6 +21,7 @@ # For enableQT. , qtbase +, wrapQtAppsHook # For enableXM. , motif @@ -48,12 +49,12 @@ let in stdenv.mkDerivation rec { - version = "10.7.0"; + version = "10.7.1"; pname = "geant4"; src = fetchurl{ - url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.tar.gz"; - sha256 = "0jmdxb8z20d4l6sf2w0gk9ska48kylm38yngy3mzyvyj619a8vkp"; + url = "https://geant4-data.web.cern.ch/geant4-data/releases/geant4.10.07.p01.tar.gz"; + sha256 = "07if874aljizkjyp21qj6v193pmyifyfmwi5kg8jm71x79sn2laj"; }; boost_python_lib = "python${builtins.replaceStrings ["."] [""] python3.pythonVersion}"; @@ -87,7 +88,13 @@ stdenv.mkDerivation rec { "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ] ++ lib.optionals enableQT [ + wrapQtAppsHook + ]; + + dontWrapQtApps = !enableQT; buildInputs = [ libGLU xlibsWrapper libXmu ] ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ] @@ -101,6 +108,8 @@ stdenv.mkDerivation rec { postFixup = '' # Don't try to export invalid environment variables. sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh + '' + lib.optionalString enableQT '' + wrapQtAppsHook ''; setupHook = ./geant4-hook.sh;