From f14537a8967841aef8b668355698f1b257957b0c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Apr 2009 18:07:09 +0000
Subject: [PATCH] * Use makeOverridable for the QT3 variants.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15194
---
 pkgs/top-level/all-packages.nix | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82aeca97f3d..982068ed0bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3805,16 +3805,7 @@ let
     inherit fetchurl stdenv;
   };
 
-  qt3gcc33 = import ../development/libraries/qt-3 {
-    stdenv = overrideGCC stdenv gcc33;
-    inherit fetchurl x11 zlib libjpeg libpng which mysql mesa;
-    inherit (xlibs) xextproto libXft libXrender libXrandr randrproto
-      libXmu libXinerama xineramaproto libXcursor;
-    openglSupport = false;
-    mysqlSupport = false;
-  };
-
-  qt3 = import ../development/libraries/qt-3 {
+  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;
@@ -3822,11 +3813,13 @@ let
     mysqlSupport = getConfig ["qt" "mysql"] false;
   };
 
-  qt3mysql = 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;
-    openglSupport = mesaSupported;
+  qt3gcc33 = qt3.override {
+    stdenv = overrideGCC stdenv gcc33;
+    openglSupport = false;
+    mysqlSupport = false;
+  };
+
+  qt3mysql = qt3.override {
     mysqlSupport = true;
   };