Author: viric
Date: Fri Feb 24 21:13:14 2012
New Revision: 32549
URL: https://nixos.org/websvn/nix/?rev=32549&sc=1
Log:
Updating angelscript to 2.22.1.
Adding mysocketw.
Adding ogre-paged.
Fixing the caelum licence.
Added:
nixpkgs/trunk/pkgs/development/libraries/mysocketw/
nixpkgs/trunk/pkgs/development/libraries/mysocketw/default.nix
nixpkgs/trunk/pkgs/development/libraries/mysocketw/gcc.patch
nixpkgs/trunk/pkgs/development/libraries/ogrepaged/
nixpkgs/trunk/pkgs/development/libraries/ogrepaged/default.nix
Modified:
nixpkgs/trunk/pkgs/development/interpreters/angelscript/default.nix
nixpkgs/trunk/pkgs/development/libraries/caelum/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/interpreters/angelscript/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/interpreters/angelscript/default.nix Fri Feb
24 20:34:35 2012 (r32548)
+++ nixpkgs/trunk/pkgs/development/interpreters/angelscript/default.nix Fri Feb
24 21:13:14 2012 (r32549)
@@ -11,10 +11,10 @@
(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 {
Modified: nixpkgs/trunk/pkgs/development/libraries/caelum/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/caelum/default.nix Fri Feb 24
20:34:35 2012 (r32548)
+++ nixpkgs/trunk/pkgs/development/libraries/caelum/default.nix Fri Feb 24
21:13:14 2012 (r32549)
@@ -16,6 +16,6 @@
meta = {
description = "Add-on for the OGRE, aimed to render atmospheric effects";
homepage = http://code.google.com/p/caelum/;
- license = "LGPLv2+";
+ license = "LGPLv2.1+";
};
}
Added: nixpkgs/trunk/pkgs/development/libraries/mysocketw/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/mysocketw/default.nix Fri Feb
24 21:13:14 2012 (r32549)
@@ -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;
+ };
+}
Added: nixpkgs/trunk/pkgs/development/libraries/mysocketw/gcc.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/mysocketw/gcc.patch Fri Feb
24 21:13:14 2012 (r32549)
@@ -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>
Added: nixpkgs/trunk/pkgs/development/libraries/ogrepaged/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/development/libraries/ogrepaged/default.nix Fri Feb
24 21:13:14 2012 (r32549)
@@ -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";
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Feb 24 20:34:35
2012 (r32548)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Feb 24 21:13:14
2012 (r32549)
@@ -4371,6 +4371,8 @@
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 @@
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)
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
