diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2023-11-26 22:46:21 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2023-11-26 22:46:21 -0500 |
| commit | 8a38af038c0bb57b35c165cfeffa8b962b90ff8c (patch) | |
| tree | a75239bdace2b3684e99ac47b04bdbdb1187564f | |
| parent | geant4: 11.0.4 -> 11.1.3 (diff) | |
| download | nixpkgs-origin/pr/geant_11_1_3.tar.gz | |
geant4: unbreak for darwinorigin/pr/geant_11_1_3
| -rw-r--r-- | pkgs/development/libraries/physics/geant4/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 0b5b4335fbea..b2b368f0349e 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -3,7 +3,8 @@ , enableQT ? false # deprecated name , enableQt ? enableQT , enableXM ? false -, enableOpenGLX11 ? true +, mesa +, enableOpenGLX11 ? !mesa.meta.broken , enablePython ? false , enableRaytracerX11 ? false @@ -75,7 +76,7 @@ stdenv.mkDerivation rec { "-DGEANT4_USE_SYSTEM_EXPAT=ON" "-DGEANT4_USE_SYSTEM_ZLIB=ON" "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals (enableOpenGLX11 && stdenv.isDarwin) [ "-DXQuartzGL_INCLUDE_DIR=${libGL.dev}/include" "-DXQuartzGL_gl_LIBRARY=${libGL}/lib/libGL.dylib" ] ++ lib.optionals (enableMultiThreading && enablePython) [ @@ -94,11 +95,13 @@ stdenv.mkDerivation rec { ]; dontWrapQtApps = true; # no binaries - buildInputs = [ libGLU libXext libXmu ] + buildInputs = + lib.optionals enableOpenGLX11 [ libGLU libXext libXmu ] ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ] ++ lib.optionals enablePython [ boost_python python3 ]; - propagatedBuildInputs = [ clhep expat xercesc zlib libGL ] + propagatedBuildInputs = [ clhep expat xercesc zlib ] + ++ lib.optionals enableOpenGLX11 [ libGL ] ++ lib.optionals enableXM [ motif ] ++ lib.optionals enableQt [ qtbase ]; |