From 52e699dcdfed6c839e6016d767b73c8587ec27fb Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 11 Apr 2016 16:48:01 +0300 Subject: [PATCH] ogre: don't build with nvigia-cg and samples by default, add flags --- pkgs/development/libraries/ogre/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 89d694cc497..aba02827665 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -1,11 +1,12 @@ -{ fetchurl, stdenv +{ fetchurl, stdenv, lib , cmake, mesa , freetype, freeimage, zziplib, randrproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois , xproto, libX11, libXmu, libSM, pkgconfig , libXxf86vm, xf86vidmodeproto, libICE , renderproto, libXrender -, nvidia_cg_toolkit }: +, withNvidiaCg ? false, nvidia_cg_toolkit +, withSamples ? false }: stdenv.mkDerivation { name = "ogre-1.9-hg-20160322"; @@ -15,10 +16,10 @@ stdenv.mkDerivation { sha256 = "0w3argjy1biaxwa3c80zxxgll67wjp8czd83p87awlcvwzdk5mz9"; }; - cmakeFlags = [ "-DOGRE_INSTALL_SAMPLES=yes" ] - ++ (map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") - [ "BSP" "CG" "OCTREE" "PCZ" "PFX" ]) - ++ (map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]); + cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ] + ++ map (x: "-DOGRE_BUILD_PLUGIN_${x}=on") + ([ "BSP" "OCTREE" "PCZ" "PFX" ] ++ lib.optional withNvidiaCg "CG") + ++ map (x: "-DOGRE_BUILD_RENDERSYSTEM_${x}=on") [ "GL" ]; enableParallelBuilding = true; @@ -29,8 +30,7 @@ stdenv.mkDerivation { xproto libX11 libXmu libSM pkgconfig libXxf86vm xf86vidmodeproto libICE renderproto libXrender - nvidia_cg_toolkit - ]; + ] ++ lib.optional withNvidiaCg nvidia_cg_toolkit; meta = { description = "A 3D engine";