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

x11: replace its usage by xlibsWrapper directly

Browse Source 
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
This commit is contained in:
Vladimír Čunát
2015-09-15 11:13:22 +02:00
parent 47ad941fbf
commit 21e3ff658a
83 changed files with 183 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;