Updating angelscript to 2.22.1.

Adding mysocketw.

Adding ogre-paged.

Fixing the caelum licence.


svn path=/nixpkgs/trunk/; revision=32549
This commit is contained in:
Lluís Batlle i Rossell
2012-02-24 21:13:14 +00:00
parent 0812ff0e57
commit d6f6caea6b
6 changed files with 66 additions and 3 deletions

View File

@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
meta = {
description = "Add-on for the OGRE, aimed to render atmospheric effects";
homepage = http://code.google.com/p/caelum/;
license = "LGPLv2+";
license = "LGPLv2.1+";
};
}

View File

@@ -0,0 +1,23 @@
{stdenv, fetchurl, openssl}:
stdenv.mkDerivation rec {
name = "mysocketw-031026";
src = fetchurl {
url = http://www.digitalfanatics.org/cal/socketw/files/SocketW031026.tar.gz;
sha256 = "0crinikhdl7xihzmc3k3k41pgxy16d5ci8m9sza1lbibns7pdwj4";
};
patches = [ ./gcc.patch ];
configurePhase = ''
sed -i s,/usr/local,$out, Makefile.conf
'';
buildInputs = [ openssl ];
meta = {
description = "Cross platform (Linux/FreeBSD/Unix/Win32) streaming socket C++";
license = "LGPLv2.1+";
platforms = stdenv.lib.platforms.all;
};
}

View File

@@ -0,0 +1,13 @@
I picked it up from:
http://www.rigsofrods.com/wiki/images/c/c0/Socketw.patch
--- a/src/sw_base.cxx.old 2009-12-19 21:19:31.057051328 -0800
+++ b/src/sw_base.cxx 2009-12-19 21:19:44.939551918 -0800
@@ -19,6 +19,7 @@
#include <time.h>
#include <stdio.h>
#include <string.h>
+#include <stdlib.h>
#ifndef __WIN32__
#include <netdb.h>

View File

@@ -0,0 +1,23 @@
{ stdenv, fetchurl, cmake, pkgconfig, ois, ogre, libX11, boost }:
stdenv.mkDerivation rec {
name = "ogre-paged-1.1.3";
src = fetchurl {
url = "http://ogre-paged.googlecode.com/files/${name}.tar.gz";
sha256 = "1qqlkg17plk87dm3fsm34x8lkd5rxkhiz77ppcgc71a7z050vhjq";
};
buildInputs = [ ois ogre libX11 boost ];
buildNativeInputs = [ cmake pkgconfig ];
cmakeFlags = "-DPAGEDGEOMETRY_BUILD_SAMPLES=OFF";
enableParallelBuilding = true;
meta = {
description = "Paged Geometry for Ogre3D";
homepage = http://code.google.com/p/ogre-paged/;
license = "MIT";
};
}