From 8fd610bff97c93953b45fc3f927705c374e5fb7a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 3 Nov 2009 21:55:53 +0000
Subject: [PATCH] * Fixed Qt 3.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18083
---
 pkgs/development/libraries/qt-3/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index e1bc3f897418..64b984c3f3af 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -2,7 +2,7 @@
 , xftSupport ? true, libXft ? null
 , xrenderSupport ? true, libXrender ? null
 , xrandrSupport ? true, libXrandr ? null, randrproto ? null
-, xineramaSupport ? true, libXinerama ? null, xineramaproto ? null
+, xineramaSupport ? true, libXinerama ? null
 , cursorSupport ? true, libXcursor ? null
 , threadSupport ? true
 , mysqlSupport ? true, mysql ? null
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
     ${if xrandrSupport then "-xrandr
       -L${libXrandr}/lib -I${libXrandr}/include
       -I${randrproto}/include" else "-no-xrandr"}
-    ${if xineramaSupport then "-xinerama -L${libXinerama}/lib -I${xineramaproto}/include" else "-no-xinerama"}
+    ${if xineramaSupport then "-xinerama -L${libXinerama}/lib -I${libXinerama}/include" else "-no-xinerama"}
     ${if cursorSupport then "-L${libXcursor}/lib -I${libXcursor}/include" else ""}
     ${if mysqlSupport then "-qt-sql-mysql -L${mysql}/lib/mysql -I${mysql}/include/mysql" else ""}
     ${if xftSupport then "-xft
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a093bca740a8..9393b08deb03 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4344,7 +4344,7 @@ let
   qt3 = makeOverridable (import ../development/libraries/qt-3) {
     inherit fetchurl stdenv x11 zlib libjpeg libpng which mysql mesa;
     inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
-      libXmu libXinerama xineramaproto libXcursor;
+      libXmu libXinerama libXcursor;
     openglSupport = mesaSupported;
     mysqlSupport = getConfig ["qt" "mysql"] false;
   };