Author: chaoflow
Date: Wed Jan 4 23:05:51 2012
New Revision: 31305
URL: https://nixos.org/websvn/nix/?rev=31305&sc=1
Log:
wip: privateer
Added:
nixpkgs/trunk/pkgs/games/privateer/
nixpkgs/trunk/pkgs/games/privateer/0001-fix-VSFile-constructor.patch
nixpkgs/trunk/pkgs/games/privateer/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Added: nixpkgs/trunk/pkgs/games/privateer/0001-fix-VSFile-constructor.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/games/privateer/0001-fix-VSFile-constructor.patch
Wed Jan 4 23:05:51 2012 (r31305)
@@ -0,0 +1,25 @@
+From e779a2b8d53e7e4721ce5ddb8e8b1caa753b66dd Mon Sep 17 00:00:00 2001
+From: Florian Friesdorf <f...@chaoflow.net>
+Date: Wed, 4 Jan 2012 23:32:19 +0100
+Subject: [PATCH] fix VSFile constructor
+
+---
+ src/vsfilesystem.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/vsfilesystem.h b/src/vsfilesystem.h
+index 4bb7a66..71bf9b9 100644
+--- a/src/vsfilesystem.h
++++ b/src/vsfilesystem.h
+@@ -291,7 +291,7 @@ namespace VSFileSystem
+ VSFile();
+ VSFile( const char * buffer, long size, VSFileType
type=ZoneBuffer, VSFileMode=ReadOnly);
+ VSFile( const char * filename, VSFileType
type=UnknownFile, VSFileMode=ReadOnly);
+- VSFile( const string &filename, VSFileType
type=UnknownFile) { VSFile::VSFile( filename.c_str(), type); }
++ VSFile( const string &filename, VSFileType
type=UnknownFile) { VSFile( filename.c_str(), type); }
+ ~VSFile();
+
+ FILE * GetFP() { return this->fp; } // This is still
needed for special cases (when loading PNG files)
+--
+1.7.8
+
Added: nixpkgs/trunk/pkgs/games/privateer/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/games/privateer/default.nix Wed Jan 4 23:05:51
2012 (r31305)
@@ -0,0 +1,28 @@
+{ stdenv, fetchsvn, boost, cmake, ffmpeg, freeglut, glib,
+ gtk, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp,
+ libXmu, mesa, openal, pixman, pkgconfig, python27Full, SDL }:
+
+stdenv.mkDerivation {
+ name = "privateer-1.03";
+
+ src = fetchsvn {
+ #url =
"mirror://sourceforge/project/privateer/Wing%20Commander%20Privateer/Privateer%20Gemini%20Gold%201.03/PrivateerGold1.03.bz2.bin";
+ url =
"https://privateer.svn.sourceforge.net/svnroot/privateer/privgold/trunk/engine";;
+ rev = 294;
+ sha256 =
"e1759087d4565d3fc95e5c87d0f6ddf36b2cd5befec5695ec56ed5f3cd144c63";
+ };
+
+ buildInputs =
+ [ boost cmake ffmpeg freeglut glib gtk libjpeg libpng
+ libpthreadstubs libvorbis libXau libXdmcp libXmu mesa openal
+ pixman pkgconfig python27Full SDL ];
+
+ patches = [ ./0001-fix-VSFile-constructor.patch ];
+
+ meta = {
+ homepage = http://privateer.sourceforge.net/;
+ longDescription = "";
+ maintainers = with stdenv.lib.maintainers; [ chaoflow ];
+ platforms = stdenv.lib.platforms.gnu;
+ };
+}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Jan 4 23:05:41
2012 (r31304)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Jan 4 23:05:51
2012 (r31305)
@@ -1262,6 +1262,8 @@
radvd = callPackage ../tools/networking/radvd { };
+ privateer = callPackage ../games/privateer { };
+
rtmpdump = callPackage ../tools/video/rtmpdump { };
recutils = callPackage ../tools/misc/recutils { };
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
