diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-02-24 21:13:14 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-02-24 21:13:14 +0000 |
commit | d6f6caea6be6526a8cef8e3c738b8504efb98bb1 (patch) | |
tree | 111eb1424d0619cde3f8788516b170afc26e67b3 /pkgs | |
parent | 0812ff0e57c00fd757d29d2290834cb733fc23e5 (diff) | |
download | nixlib-d6f6caea6be6526a8cef8e3c738b8504efb98bb1.tar nixlib-d6f6caea6be6526a8cef8e3c738b8504efb98bb1.tar.gz nixlib-d6f6caea6be6526a8cef8e3c738b8504efb98bb1.tar.bz2 nixlib-d6f6caea6be6526a8cef8e3c738b8504efb98bb1.tar.lz nixlib-d6f6caea6be6526a8cef8e3c738b8504efb98bb1.tar.xz nixlib-d6f6caea6be6526a8cef8e3c738b8504efb98bb1.tar.zst nixlib-d6f6caea6be6526a8cef8e3c738b8504efb98bb1.zip |
Updating angelscript to 2.22.1.
Adding mysocketw. Adding ogre-paged. Fixing the caelum licence. svn path=/nixpkgs/trunk/; revision=32549
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/interpreters/angelscript/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/caelum/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/mysocketw/default.nix | 23 | ||||
-rw-r--r-- | pkgs/development/libraries/mysocketw/gcc.patch | 13 | ||||
-rw-r--r-- | pkgs/development/libraries/ogrepaged/default.nix | 23 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
6 files changed, 66 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 65ff72bae56f..fa53071d306a 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -11,10 +11,10 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="angelscript"; - version="2.20.2"; + version="2.22.1"; name="${baseName}-${version}"; url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip"; - hash="0s5d6av27dl6kxkzns011zwznj7r8zy5ypfhl6x9r1kzaqdkqz2a"; + hash="0fmw0cb7ymgyq31r4cfvsn4k86r20hj650fbzs9i7zl0p3lb6hpm"; }; in rec { diff --git a/pkgs/development/libraries/caelum/default.nix b/pkgs/development/libraries/caelum/default.nix index 68d96f4f3739..75eb5109b453 100644 --- a/pkgs/development/libraries/caelum/default.nix +++ b/pkgs/development/libraries/caelum/default.nix @@ -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+"; }; } diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix new file mode 100644 index 000000000000..c1cada63abee --- /dev/null +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -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; + }; +} diff --git a/pkgs/development/libraries/mysocketw/gcc.patch b/pkgs/development/libraries/mysocketw/gcc.patch new file mode 100644 index 000000000000..7779a18fa528 --- /dev/null +++ b/pkgs/development/libraries/mysocketw/gcc.patch @@ -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> diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix new file mode 100644 index 000000000000..6b2b9c9e4a65 --- /dev/null +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -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"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2c10d56be12..6792996dbf40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4371,6 +4371,8 @@ let myguiSvn = callPackage ../development/libraries/mygui/svn.nix {}; + mysocketw = callPackage ../development/libraries/mysocketw { }; + ncurses = makeOverridable (import ../development/libraries/ncurses) { inherit fetchurl stdenv; unicode = system != "i686-cygwin"; @@ -4416,6 +4418,8 @@ let ogre = callPackage ../development/libraries/ogre {}; + ogrepaged = callPackage ../development/libraries/ogrepaged { }; + openal = callPackage ../development/libraries/openal { }; # added because I hope that it has been easier to compile on x86 (for blender) |