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

treewide: Get rid of libGLU_combined

Browse Source
This commit is contained in:
adisbladis
2019-11-18 20:10:43 +00:00
parent e6963bc983
commit c9d8624ccd
241 changed files with 518 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/mygui/default.nix
+3 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid,
boost, pkgconfig, withOgre ? false, ogre ? null, libGLU_combined ? null } :
boost, pkgconfig, withOgre ? false, ogre ? null, libGL, libGLU ? null } :
let
renderSystem = if withOgre then "3" else "4";
@@ -17,7 +17,8 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libX11 unzip cmake ois freetype libuuid boost (if withOgre then ogre else libGLU_combined) ];
buildInputs = [ libX11 unzip cmake ois freetype libuuid boost ]
++ (if withOgre then [ ogre ] else [libGL libGLU]);
# Tools are disabled due to compilation failures.
cmakeFlags = [ "-DMYGUI_BUILD_TOOLS=OFF" "-DMYGUI_BUILD_DEMOS=OFF" "-DMYGUI_RENDERSYSTEM=${renderSystem}" ];