From 024d1b785129e07fd0c60309c76e6443431c7e20 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Sat, 22 Aug 2009 14:50:18 +0000
Subject: [PATCH] fix compiz-0.6. Now nix-env -q \* should work again.

svn path=/nixpkgs/trunk/; revision=16811
---
 pkgs/top-level/all-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 12d22fb9637..fb3b53ceb50 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6039,8 +6039,8 @@ let
     version = "0.6.2";
   };
 
-  compizBase = builderDefsPackage (selectVersion ../applications/window-managers/compiz "0.8.0") {
-    inherit lib builderDefs stringsWithDeps;
+  compizBase = (builderDefsPackage (selectVersion ../applications/window-managers/compiz "0.8.0")) {
+    inherit lib stringsWithDeps;
     inherit fetchurl stdenv pkgconfig libpng mesa perl perlXMLParser libxslt gettext
       intltool binutils;
     inherit (xorg) libXcomposite libXfixes libXdamage libXrandr
@@ -6058,9 +6058,9 @@ let
     inherit dbus dbus_glib;
   };
 
-  compiz = compizBase.passthru.function {
+  compiz = compizBase.passthru.function (x : x // {
     extraConfigureFlags = getConfig ["compiz" "extraConfigureFlags"] [];
-  };
+  });
 
   compizFusion = import ../applications/window-managers/compiz-fusion {
     version = getConfig ["compizFusion" "version"] "0.7.8";