about summary refs log tree commit diff
path: root/pkgs/development/libraries/physics
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-09-15 11:13:22 +0200
committerVladimír Čunát <vcunat@gmail.com>2015-09-15 12:08:24 +0200
commit21e3ff658ac2d7b7986169f31550aa5f65bb7635 (patch)
treea23f824d60d9aad34473c8828278c0fdba2dc188 /pkgs/development/libraries/physics
parent47ad941fbfe752f679d6bc577d2408f79aee7054 (diff)
downloadnixlib-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar
nixlib-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.gz
nixlib-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.bz2
nixlib-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.lz
nixlib-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.xz
nixlib-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.zst
nixlib-21e3ff658ac2d7b7986169f31550aa5f65bb7635.zip
x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
Diffstat (limited to 'pkgs/development/libraries/physics')
-rw-r--r--pkgs/development/libraries/physics/geant4/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 872576d9fb02..2c07c1e08580 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -26,7 +26,7 @@
 
 # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11.
 , mesa   ? null
-, x11    ? null
+, xlibsWrapper    ? null
 , libXmu ? null
 }:
 
@@ -41,7 +41,7 @@ assert enableXM -> motif != null;
 
 # OpenGL/X11 User Interface and Visualisation drivers.
 assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> mesa   != null;
-assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> x11    != null;
+assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWrapper    != null;
 assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null;
 
 let
@@ -81,8 +81,8 @@ let
       };
 
       enableParallelBuilding = true;
-      buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa x11 libXmu ];
-      propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa x11 libXmu ];
+      buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ];
+      propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ];
 
       setupHook = ./setup-hook.sh;