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

treewide: transition mesa to libGLU_combined

Browse Source
This commit is contained in:
Alexander V. Nikolaev
2018-02-24 17:06:49 +02:00
parent 1bc1909e5b
commit 0acec7e984
273 changed files with 572 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/physics/geant4/default.nix
+4 -4
View File
@@ -25,7 +25,7 @@
, motif ? null # motif or lesstif
# For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11.
, mesa ? null
, libGLU_combined ? null
, xlibsWrapper ? null
, libXmu ? null
}:
@@ -40,7 +40,7 @@ assert enableQT -> qt != null;
assert enableXM -> motif != null;
# OpenGL/X11 User Interface and Visualisation drivers.
assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> mesa != null;
assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libGLU_combined != null;
assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWrapper != null;
assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null;
@@ -81,8 +81,8 @@ let
};
enableParallelBuilding = true;
buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ];
propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ];
buildInputs = [ cmake clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu ];
propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu ];
setupHook = ./setup-hook.sh;