From 0d577e421d495355cd1893498a648c687f86e8ec Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 30 Jan 2009 06:26:40 +0000
Subject: [PATCH] fix fsg build after updates in all-packages

svn path=/nixpkgs/trunk/; revision=13913
---
 pkgs/games/fsg/alt-builder.nix  | 2 +-
 pkgs/games/fsg/default.nix      | 2 +-
 pkgs/top-level/all-packages.nix | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/fsg/alt-builder.nix b/pkgs/games/fsg/alt-builder.nix
index 70a342e32269..da0c127a6e74 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 =[(wxGTK null)];
+  		buildInputs =[mesa (wxGTK null) 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 0922bf2e4c13..891ac488bf38 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 (wxGTK null)];
+  buildInputs =[gtk glib pkgconfig mesa (wxGTK null) libX11 xproto];
 
 /*  
 #	One day Unicode will overcome?
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a514450f327..cbd4fda153c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8410,14 +8410,16 @@ let
   });
 
   fsg = import ../games/fsg {
-    inherit stdenv fetchurl pkgconfig;
+    inherit stdenv fetchurl pkgconfig mesa;
     inherit (gtkLibs) glib gtk;
+    inherit (xlibs) libX11 xproto;
     wxGTK = wxGTK28deps {unicode = false;};
   };
 
   fsgAltBuild = import ../games/fsg/alt-builder.nix {
-    inherit stdenv fetchurl;
+    inherit stdenv fetchurl mesa;
     wxGTK = wxGTK28deps {unicode = false;};
+    inherit (xlibs) libX11 xproto;
     stringsWithDeps = import ../lib/strings-with-deps.nix {
       inherit stdenv lib;
     };