From 3871c1ebd29542be2128089871cb4260fd1c5ce4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 10 Dec 2009 06:55:12 +0000
Subject: [PATCH] Update xboard

svn path=/nixpkgs/trunk/; revision=18870
---
 pkgs/games/xboard/default.nix              | 13 +++++++------
 pkgs/games/xboard/src-for-default.nix      |  9 +++++++++
 pkgs/games/xboard/src-info-for-default.nix |  4 ++++
 pkgs/top-level/all-packages.nix            |  4 ++--
 4 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/games/xboard/src-for-default.nix
 create mode 100644 pkgs/games/xboard/src-info-for-default.nix

diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix
index 1c116f40f308..a1a65165326b 100644
--- a/pkgs/games/xboard/default.nix
+++ b/pkgs/games/xboard/default.nix
@@ -1,17 +1,18 @@
-a :  
+a:  
 let 
   fetchurl = a.fetchurl;
 
-  version = a.lib.attrByPath ["version"] "4.2.7" a; 
   buildInputs = with a; [
     libX11 xproto libXt libXaw libSM libICE libXmu 
-    libXext gnuchess
+    libXext gnuchess texinfo libXpm
   ];
+
+  s = import ./src-for-default.nix;
 in
 rec {
   src = fetchurl {
-    url = "http://ftp.gnu.org/gnu/xboard/xboard-${version}.tar.gz";
-    sha256 = "0fwdzcav8shvzi7djphrlav29vwxnx63spzsldlhrglr7qpg28av";
+    inherit(s) url;
+    sha256 = s.hash;
   };
 
   inherit buildInputs;
@@ -25,7 +26,7 @@ rec {
     sed -e '/SECOND_CHESS_PROGRAM/s@gnuchessx@${a.gnuchess}/bin/gnuchessx@' -i xboard.h
   '') ["doUnpack" "minInit"];
       
-  name = "xboard-" + version;
+  inherit(s) name;
   meta = {
     description = "XBoard - a chess board compatible with GNU Chess";
   };
diff --git a/pkgs/games/xboard/src-for-default.nix b/pkgs/games/xboard/src-for-default.nix
new file mode 100644
index 000000000000..d648dfe5abbc
--- /dev/null
+++ b/pkgs/games/xboard/src-for-default.nix
@@ -0,0 +1,9 @@
+rec {
+   version="4.4.2";
+   name="xboard-4.4.2";
+   hash="1ihg39nnwp90w410rzwxj9layadavz08gc9m2b1jg5z5c6ky28zp";
+   url="http://ftp.gnu.org/gnu/xboard/xboard-${version}.tar.gz";
+   advertisedUrl="http://ftp.gnu.org/gnu/xboard/xboard-4.4.2.tar.gz";
+  
+  
+}
diff --git a/pkgs/games/xboard/src-info-for-default.nix b/pkgs/games/xboard/src-info-for-default.nix
new file mode 100644
index 000000000000..8d0386671a10
--- /dev/null
+++ b/pkgs/games/xboard/src-info-for-default.nix
@@ -0,0 +1,4 @@
+{
+  downloadPage = "http://ftp.gnu.org/gnu/xboard/?C=T,M;O=D";
+  baseName = "xboard";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f866e4211a6..7c2c834eb2a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8023,8 +8023,8 @@ let
 
   xboard = builderDefsPackage (import ../games/xboard) {
     inherit (xlibs) libX11 xproto libXt libXaw libSM
-      libICE libXmu libXext;
-    inherit gnuchess;
+      libICE libXmu libXext libXpm;
+    inherit gnuchess texinfo;
   };
 
   xsokoban = builderDefsPackage (import ../games/xsokoban) {