Author: raskin
Date: Wed Dec 22 14:50:13 2010
New Revision: 25240
URL: https://svn.nixos.org/websvn/nix/?rev=25240&sc=1
Log:
Adding OGRE - object-oriented graphical engine
Added:
nixpkgs/trunk/pkgs/development/libraries/ogre/
nixpkgs/trunk/pkgs/development/libraries/ogre/default.nix
Modified:
nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix Wed Dec
22 14:03:55 2010 (r25239)
+++ nixpkgs/trunk/pkgs/build-support/builder-defs/builder-defs.nix Wed Dec
22 14:50:13 2010 (r25240)
@@ -384,6 +384,14 @@
echo '${toString (attrByPath ["propagatedBuildInputs"] []
args)}' >\$out/nix-support/propagated-build-inputs
") ["minInit" "defEnsureDir"];
+ cmakeFlags = "";
+
+ doCmake = fullDepEntry (''
+ mkdir build
+ cd build
+ cmake -D CMAKE_INSTALL_PREFIX="$out" ${toString cmakeFlags} ..
+ '') ["minInit" "addInputs" "doUnpack"];
+
/*debug = x:(trace x x);
debugX = x:(trace (toXML x) x);*/
Added: nixpkgs/trunk/pkgs/development/libraries/ogre/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/ogre/default.nix Wed Dec 22
14:50:13 2010 (r25240)
@@ -0,0 +1,57 @@
+...@{builderdefspackage
+ , mesa, cmake, automake, libtool, autoconf
+ , freetype, freeimage, zziplib, randrproto, libXrandr
+ , libXaw, freeglut, libXt, libpng, boost, ois
+ , xproto, libX11, libXmu, libSM, pkgconfig
+ , libXxf86vm, xf86vidmodeproto, libICE
+ , renderproto, libXrender
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ baseName="ogre";
+ majorVersion="1";
+ minorVersion="7";
+ patchLevel="2";
+ version="${majorVersion}.${minorVersion}.${patchLevel}";
+ name="${baseName}-${version}";
+ project="${baseName}";
+
url="mirror://sourceforge/project/${project}/${baseName}/${majorVersion}.${minorVersion}/${baseName}_src_v${majorVersion}-${minorVersion}-${patchLevel}.tar.bz2";
+ hash="10q8jx842s4aws9py6q67rb4dh5vli5vvg54jl8manjb4f388jh5";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["doCmake" "doMakeInstall"];
+
+ meta = {
+ description = "A 3D engine";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ linux;
+ license = "MIT";
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://www.ogre3d.org/download/source";;
+ };
+ };
+}) x
+
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Dec 22 14:03:55
2010 (r25239)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Dec 22 14:50:13
2010 (r25240)
@@ -3721,6 +3721,8 @@
ode = builderDefsPackage (import ../development/libraries/ode) {
};
+
+ ogre = callPackage ../development/libraries/ogre {};
openal = callPackage ../development/libraries/openal { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
