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

geant4: move parameter definitions from all-packages, use system zlib, use qt5

Browse Source
This commit is contained in:
Dmitry Kalinkin 2018-05-17 12:45:41 -04:00
parent 4d33e289b5
commit f3049d020a
2 changed files with 14 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,55 +1,40 @@
{ enableMultiThreading ? false { enableMultiThreading ? true
, enableG3toG4 ? false , enableG3toG4 ? false
, enableInventor ? false , enableInventor ? false
, enableGDML ? false , enableGDML ? false
, enableQT ? false , enableQT ? false
, enableXM ? false , enableXM ? false
, enableOpenGLX11 ? false , enableOpenGLX11 ? true
, enableRaytracerX11 ? false , enableRaytracerX11 ? false
# Standard build environment with cmake. # Standard build environment with cmake.
, stdenv, fetchurl, cmake , stdenv, fetchurl, cmake
# Optional system packages, otherwise internal GEANT4 packages are used. # Optional system packages, otherwise internal GEANT4 packages are used.
, clhep ? null , clhep ? null # not packaged currently
, expat ? null , expat
, zlib ? null , zlib
# For enableGDML. # For enableGDML.
, xercesc ? null , xercesc
# For enableQT. # For enableQT.
, qt ? null # qt4SDK or qt5SDK , qtbase
# For enableXM. # For enableXM.
, motif ? null # motif or lesstif , motif
# For enableInventor # For enableInventor
, coin3d , coin3d
, soxt , soxt
, libXpm ? null , libXpm
# For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11. # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11.
, libGLU_combined ? null , libGLU_combined
, xlibsWrapper ? null , xlibsWrapper
, libXmu ? null , libXmu
}: }:
# G4persistency library with support for GDML
assert enableGDML -> xercesc != null;
# If enableQT, Qt4/5 User Interface and Visualization drivers.
assert enableQT -> qt != null;
# Motif User Interface and Visualisation drivers.
assert enableXM -> motif != null;
# OpenGL/X11 User Interface and Visualisation drivers.
assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libGLU_combined != null;
assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWrapper != null;
assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null;
assert enableInventor -> libXpm != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "10.4.1"; version = "10.4.1";
name = "geant4-${version}"; name = "geant4-${version}";
@ -82,7 +67,7 @@ stdenv.mkDerivation rec {
buildInputs = [ clhep expat zlib libGLU_combined xlibsWrapper libXmu ] buildInputs = [ clhep expat zlib libGLU_combined xlibsWrapper libXmu ]
++ stdenv.lib.optionals enableGDML [ xercesc ] ++ stdenv.lib.optionals enableGDML [ xercesc ]
++ stdenv.lib.optionals enableXM [ motif ] ++ stdenv.lib.optionals enableXM [ motif ]
++ stdenv.lib.optionals enableQT [ qt ] ++ stdenv.lib.optionals enableQT [ qtbase ]
++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt ]; ++ stdenv.lib.optionals enableInventor [ libXpm coin3d soxt ];
postFixup = '' postFixup = ''

21
pkgs/top-level/all-packages.nix
View File

@ -21286,26 +21286,7 @@ with pkgs;
fastnlo = callPackage ../development/libraries/physics/fastnlo { }; fastnlo = callPackage ../development/libraries/physics/fastnlo { };
geant4 = callPackage ../development/libraries/physics/geant4 { geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { };
enableMultiThreading = true;
enableG3toG4 = false;
enableInventor = false;
enableGDML = false;
enableQT = false;
enableXM = false;
enableOpenGLX11 = true;
enableRaytracerX11 = false;
# Optional system packages, otherwise internal GEANT4 packages are used.
clhep = null;
zlib = null;
# For enableGDML.
xercesc = null;
# For enableQT.
qt = null; # qt4SDK or qt5SDK
};
cernlib = callPackage ../development/libraries/physics/cernlib { }; cernlib = callPackage ../development/libraries/physics/cernlib { };