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

Merge pull request #14611 from abbradar/ogre-no-nvidia

Browse Source 
ogre: don't build with nvigia-cg and samples by default, add flags
This commit is contained in:
Nikolay Amiantov 2016-04-20 21:06:56 +04:00
commit d3877b7cb0
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/ogre/default.nix
View File

@ -1,11 +1,12 @@
{ fetchurl, stdenv { fetchurl, stdenv, lib
, cmake, mesa , cmake, mesa
, freetype, freeimage, zziplib, randrproto, libXrandr , freetype, freeimage, zziplib, randrproto, libXrandr
, libXaw, freeglut, libXt, libpng, boost, ois , libXaw, freeglut, libXt, libpng, boost, ois
, xproto, libX11, libXmu, libSM, pkgconfig , xproto, libX11, libXmu, libSM, pkgconfig
, libXxf86vm, xf86vidmodeproto, libICE , libXxf86vm, xf86vidmodeproto, libICE
, renderproto, libXrender , renderproto, libXrender
, nvidia_cg_toolkit }: , withNvidiaCg ? false, nvidia_cg_toolkit
, withSamples ? false }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ogre-1.9-hg-20160322"; name = "ogre-1.9-hg-20160322";
@ -15,10 +16,10 @@ stdenv.mkDerivation {
sha256 = "0w3argjy1biaxwa3c80zxxgll67wjp8czd83p87awlcvwzdk5mz9"; sha256 = "0w3argjy1biaxwa3c80zxxgll67wjp8czd83p87awlcvwzdk5mz9";
}; };
cmakeFlags = [ "-DOGRE_INSTALL_SAMPLES=yes" ] cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ]
++ (map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on")
[ "BSP" "CG" "OCTREE" "PCZ" "PFX" ]) ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG")
++ (map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]); ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -29,8 +30,7 @@ stdenv.mkDerivation {
xproto libX11 libXmu libSM pkgconfig xproto libX11 libXmu libSM pkgconfig
libXxf86vm xf86vidmodeproto libICE libXxf86vm xf86vidmodeproto libICE
renderproto libXrender renderproto libXrender
nvidia_cg_toolkit ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;
];
meta = { meta = {
description = "A 3D engine"; description = "A 3D engine";