From 69f10d77bfbf033a0aa38ee0730e3094c88e7a52 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 27 Oct 2007 17:55:13 +0000
Subject: [PATCH] Added Falling Sand Game and wxGTK without unicode for it.

svn path=/nixpkgs/trunk/; revision=9543
---
 pkgs/top-level/all-packages.nix | 57 +++++++++++++++++++++++++++++++--
 1 file changed, 55 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 385d3a0ac874..34d41df8d440 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -853,6 +853,35 @@ rec {
     inherit stdenv;
   };
 
+  g77_40 = import ../build-support/gcc-wrapper {
+    name = "g77-4.0";
+    nativeTools = false;
+    nativeLibc = false;
+    gcc = import ../development/compilers/gcc-4.0 {
+      inherit fetchurl stdenv noSysDirs;
+      langF77 = true;
+      langCC = false;
+	inherit gmp mpfr;
+    };
+    inherit (stdenv.gcc) binutils libc;
+    inherit stdenv;
+  };
+ 
+  g77_41 = import ../build-support/gcc-wrapper {
+    name = "g77-4.1";
+    nativeTools = false;
+    nativeLibc = false;
+    gcc = import ../development/compilers/gcc-4.1 {
+      inherit fetchurl stdenv noSysDirs;
+      langF77 = true;
+      langCC = false;
+      langC = false;
+	inherit gmp mpfr;
+    };
+    inherit (stdenv.gcc) binutils libc;
+    inherit stdenv;
+  };
+ 
   gcc = gcc41;
 
   gcc295 = wrapGCC (import ../development/compilers/gcc-2.95 {
@@ -1096,7 +1125,8 @@ rec {
   };
 
   octave = import ../development/interpreters/octave {
-    inherit fetchurl stdenv readline ncurses g77 perl flex;
+    inherit stdenv fetchurl readline ncurses perl flex;
+	g77 = g77_41;
   };
 
   perl = if !stdenv.isLinux then sysPerl else realPerl;
@@ -1647,6 +1677,11 @@ rec {
     inherit fetchurl stdenv m4;
   };
 
+  #GMP ex-satellite, so better keep it near gmp
+  mpfr = import ../development/libraries/mpfr {
+    inherit fetchurl stdenv gmp;
+  };
+
   gnet = import ../development/libraries/gnet {
     inherit fetchurl stdenv pkgconfig;
     inherit (gtkLibs) glib;
@@ -2119,12 +2154,16 @@ rec {
     inherit (xlibs) libXinerama libSM libXxf86vm xf86vidmodeproto;
   };
 
-  wxGTK28 = import ../development/libraries/wxGTK-2.8 {
+  wxGTK28fun = lib.sumArgs (import ../development/libraries/wxGTK-2.8);
+
+  wxGTK28deps = wxGTK28fun {
     inherit fetchurl stdenv pkgconfig;
     inherit (gtkLibs) gtk;
     inherit (xlibs) libXinerama libSM libXxf86vm xf86vidmodeproto;
   };
 
+  wxGTK28 = wxGTK28deps null;
+
   Xaw3d = import ../development/libraries/Xaw3d {
     inherit fetchurl stdenv x11 bison;
     flex = flex2533;
@@ -3348,6 +3387,14 @@ rec {
     libstdcpp = gcc33.gcc;
   };
 
+  audacity = import ../applications/audio/audacity {
+    inherit fetchurl libogg libvorbis libsndfile libmad 
+	pkgconfig gettext;
+	inherit (gtkLibs) gtk glib;
+	wxGTK = wxGTK28;
+    stdenv = overrideGCC stdenv gcc41NPTL;
+  };
+
   batik = import ../applications/graphics/batik {
     inherit fetchurl stdenv unzip;
   };
@@ -4069,6 +4116,12 @@ rec {
     stdenv = overrideGCC stdenv gcc34;
   };
 
+  fsg = import ../games/fsg {
+	inherit stdenv fetchurl pkgconfig;
+	inherit (gtkLibs) glib gtk;
+	wxGTK = wxGTK28deps {unicode = false;};
+  };
+
   gemrb = import ../games/gemrb {
     inherit fetchurl stdenv SDL openal freealut zlib libpng python;
   };