summary refs log tree commit diff
path: root/pkgs/games
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/games')
-rw-r--r--pkgs/games/construo/0.2.2.nix2
-rw-r--r--pkgs/games/fsg/alt-builder.nix2
-rw-r--r--pkgs/games/fsg/default.nix2
-rw-r--r--pkgs/games/jamp/default.nix33
-rw-r--r--pkgs/games/jamp/src-for-default.nix9
-rw-r--r--pkgs/games/jamp/src-info-for-default.nix4
-rw-r--r--pkgs/games/orbit/1.01.nix2
7 files changed, 50 insertions, 4 deletions
diff --git a/pkgs/games/construo/0.2.2.nix b/pkgs/games/construo/0.2.2.nix
index 578e233cbd75..2b32020d8e9d 100644
--- a/pkgs/games/construo/0.2.2.nix
+++ b/pkgs/games/construo/0.2.2.nix
@@ -20,7 +20,7 @@ args : with args;
 	};
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "construo-"+version;
+	name = "construo-0.2.2";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs ["preConfigure" "doConfigure" "doMakeInstall" "doForceShare" "doPropagate"]);
 	meta = {
diff --git a/pkgs/games/fsg/alt-builder.nix b/pkgs/games/fsg/alt-builder.nix
index c2b68a6c7462..837685db2d9f 100644
--- a/pkgs/games/fsg/alt-builder.nix
+++ b/pkgs/games/fsg/alt-builder.nix
@@ -1,6 +1,6 @@
 args: with args; 
 	let localDefs = builderDefs.passthru.function {
-  		buildInputs =[mesa (wxGTK null) libX11 xproto];
+  		buildInputs =[mesa wxGTK libX11 xproto];
 		  src = 
 			fetchurl {
 				url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz;
diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix
index b67b1bcfc5f8..029c93d6690e 100644
--- a/pkgs/games/fsg/default.nix
+++ b/pkgs/games/fsg/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c";
   };
 
-  buildInputs = [gtk glib pkgconfig mesa (wxGTK null) libX11 xproto];
+  buildInputs = [gtk glib pkgconfig mesa wxGTK libX11 xproto];
 
 /*  
 #	One day Unicode will overcome?
diff --git a/pkgs/games/jamp/default.nix b/pkgs/games/jamp/default.nix
new file mode 100644
index 000000000000..b551b9b6dfce
--- /dev/null
+++ b/pkgs/games/jamp/default.nix
@@ -0,0 +1,33 @@
+a :  
+let 
+  s = import ./src-for-default.nix;
+  buildInputs = with a; [
+    mesa SDL SDL_mixer SDL_image
+
+  ];
+in
+rec {
+  src = a.fetchUrlFromSrcInfo s;
+
+  inherit (s) name;
+  inherit buildInputs;
+  configureFlags = [];
+
+  preBuild = a.fullDepEntry (''
+    sed -e "s@/usr/games@$out/bin@g" -i Makefile
+    sed -e "s@/usr/@$out/@g" -i Makefile
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.SDL}/include/SDL"
+  '') ["minInit" "addInputs" "doUnpack"];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["preBuild" "doMakeInstall"];
+      
+  meta = {
+    description = "A physics-based game";
+    maintainers = [
+      a.lib.maintainers.raskin
+    ];
+    platforms = with a.lib.platforms; 
+      linux ++ darwin;
+  };
+}
diff --git a/pkgs/games/jamp/src-for-default.nix b/pkgs/games/jamp/src-for-default.nix
new file mode 100644
index 000000000000..c5980b251c0a
--- /dev/null
+++ b/pkgs/games/jamp/src-for-default.nix
@@ -0,0 +1,9 @@
+rec {
+   version="1.0.2";
+   name="jamp-1.0.2";
+   hash="13cjggyx63wmlcvpyllmd7aknfd4vzhxnwm030mas7z3h6wcsmk7";
+   url="http://perre.noud.ch/jamp/download.php?file=jamp-${version}.tar.gz";
+   advertisedUrl="http://perre.noud.ch/jamp/download.php?file=jamp-1.0.2.tar.gz";
+  
+  
+}
diff --git a/pkgs/games/jamp/src-info-for-default.nix b/pkgs/games/jamp/src-info-for-default.nix
new file mode 100644
index 000000000000..9fb4ab9dbcc2
--- /dev/null
+++ b/pkgs/games/jamp/src-info-for-default.nix
@@ -0,0 +1,4 @@
+{
+  downloadPage = "http://perre.noud.ch/jamp/";
+  baseName = "jamp";
+}
diff --git a/pkgs/games/orbit/1.01.nix b/pkgs/games/orbit/1.01.nix
index a8cd48d99e6f..84a699d1a14d 100644
--- a/pkgs/games/orbit/1.01.nix
+++ b/pkgs/games/orbit/1.01.nix
@@ -30,7 +30,7 @@ EOF
 	});
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "space-orbit-"+version;
+	name = "space-orbit-1.01";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs 
 			[ customBuild doForceShare doPropagate]);