ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-19 11:41:43 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #56317 from yrashk/ogre-1.11.5

Browse Source 
ogre: 1.10.11 -> 1.11.5
This commit is contained in:
Michael Raskin 2019-02-27 13:24:13 +00:00 committed by GitHub
commit d389e5206c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 54 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pkgs/development/libraries/ogre/1.10.x.nix Normal file
View File

@ -0,0 +1,42 @@
{ fetchurl, stdenv, lib
, cmake, libGLU_combined
, freetype, freeimage, zziplib, xorgproto, libXrandr
, libXaw, freeglut, libXt, libpng, boost, ois
, libX11, libXmu, libSM, pkgconfig
, libXxf86vm, libICE
, libXrender
, withNvidiaCg ? false, nvidia_cg_toolkit
, withSamples ? false }:
stdenv.mkDerivation {
name = "ogre-1.10.11";
src = fetchurl {
url = "https://bitbucket.org/sinbad/ogre/get/v1-10-11.tar.gz";
sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a";
};
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;
buildInputs =
[ cmake libGLU_combined
freetype freeimage zziplib xorgproto libXrandr
libXaw freeglut libXt libpng boost ois
libX11 libXmu libSM pkgconfig
libXxf86vm libICE
libXrender
] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;
meta = {
description = "A 3D engine";
homepage = https://www.ogre3d.org/;
maintainers = [ stdenv.lib.maintainers.raskin ];
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.mit;
};
}

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

@ -4,16 +4,18 @@
, libXaw, freeglut, libXt, libpng, boost, ois
, libX11, libXmu, libSM, pkgconfig
, libXxf86vm, libICE
, unzip
, libXrender
, withNvidiaCg ? false, nvidia_cg_toolkit
, withSamples ? false }:
stdenv.mkDerivation {
name = "ogre-1.10.11";
stdenv.mkDerivation rec {
name = "ogre-${version}";
version = "1.11.5";
src = fetchurl {
url = "https://bitbucket.org/sinbad/ogre/get/v1-10-11.tar.gz";
sha256 = "1zwvlx5dz9nwjazhnrhzb0w8ilpa84r0hrxrmmy69pgr1p1yif5a";
url = "https://github.com/OGRECave/ogre/archive/v${version}.zip";
sha256 = "0hs7b81nr7i4wgsb603kkqw33m6cafjrj2zw4yhibwn8k7zzwddp";
};
cmakeFlags = [ "-DOGRE_BUILD_SAMPLES=${toString withSamples}" ]
@ -32,6 +34,8 @@ stdenv.mkDerivation {
libXrender
] ++ lib.optional withNvidiaCg nvidia_cg_toolkit;
nativeBuildInputs = [ unzip ];
meta = {
description = "A 3D engine";
homepage = https://www.ogre3d.org/;

5
pkgs/top-level/all-packages.nix
View File

@ -9524,7 +9524,9 @@ in
celt_0_7 = callPackage ../development/libraries/celt/0.7.nix {};
celt_0_5_1 = callPackage ../development/libraries/celt/0.5.1.nix {};
cegui = callPackage ../development/libraries/cegui {};
cegui = callPackage ../development/libraries/cegui {
ogre = ogre1_10;
};
certbot = callPackage ../tools/admin/certbot { };
@ -11854,6 +11856,7 @@ in
ogre = callPackage ../development/libraries/ogre {};
ogre1_9 = callPackage ../development/libraries/ogre/1.9.x.nix {};
ogre1_10 = callPackage ../development/libraries/ogre/1.10.x.nix {};
ogrepaged = callPackage ../development/libraries/ogrepaged { };