From 3f30914672bc1bdcd9257616261c2cedbf0faeb7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 14 Jan 2010 13:17:40 +0000
Subject: [PATCH] Update wine dependency on flex and add myself as maintainer

svn path=/nixpkgs/trunk/; revision=19433
---
 pkgs/misc/emulators/wine/default.nix | 2 ++
 pkgs/top-level/all-packages.nix      | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index f754951b4d41..3e773b356349 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -45,5 +45,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.winehq.org/";
     license = "LGPL";
     description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = [ "i686-linux" ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64ef37171d22..33ed143f84a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8703,9 +8703,10 @@ let
       // {system = "x86_64-linux";}
     else
       import ../misc/emulators/wine {
-        inherit fetchurl stdenv flex bison mesa ncurses
+        inherit fetchurl stdenv bison mesa ncurses
           libpng libjpeg alsaLib lcms xlibs freetype
           fontconfig fontforge libxml2 libxslt openssl;
+	flex = flex2535;
       };
 
   xosd = import ../misc/xosd {