diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-03-11 00:43:18 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-03-11 00:43:18 +0000 |
commit | a6dea5a6f496ea38f56e3c3b4c5d628361cc029f (patch) | |
tree | 8300ad67b0135e6816ab38a6ac6f8fdaeccda2f0 /nixpkgs/pkgs/development/libraries/ogre | |
parent | 8779e0045c9f218caeb1dd1bcdc87e2715ed5be5 (diff) | |
parent | 5d3fd3674a66c5b1ada63e2eace140519849c967 (diff) | |
download | nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.gz nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.bz2 nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.lz nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.xz nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.tar.zst nixlib-a6dea5a6f496ea38f56e3c3b4c5d628361cc029f.zip |
Merge commit '5d3fd3674a66c5b1ada63e2eace140519849c967'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/ogre')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix | 42 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/ogre/default.nix | 12 |
2 files changed, 50 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix b/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix new file mode 100644 index 000000000000..d847f447048d --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/ogre/1.10.x.nix @@ -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; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/ogre/default.nix b/nixpkgs/pkgs/development/libraries/ogre/default.nix index d847f447048d..cc9353af4dda 100644 --- a/nixpkgs/pkgs/development/libraries/ogre/default.nix +++ b/nixpkgs/pkgs/development/libraries/ogre/default.nix @@ -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/; |