diff --git a/pkgs/applications/window-managers/compiz/0.8.0.nix b/pkgs/applications/window-managers/compiz/0.8.0.nix
index 5ce13690991d..40215b2b5495 100644
--- a/pkgs/applications/window-managers/compiz/0.8.0.nix
+++ b/pkgs/applications/window-managers/compiz/0.8.0.nix
@@ -1,48 +1,44 @@
 args : with args;
-	let localDefs = builderDefs.passthru.function {
-		src = /* put a fetchurl here */
-		  fetchurl {
-		    url = "http://releases.compiz-fusion.org/core/compiz-0.8.0.tar.gz";
-		    sha256 = "0xhyilfz2cfbdwni774b54171addjqw7hda6j6snzxb1igny7iry";
-		  };
-		buildInputs = [
-			    pkgconfig gtk libwnck GConf libgnome 
-			    libgnomeui metacity gnomegtk glib pango libglade libgtkhtml 
-			    gtkhtml libgnomecanvas libgnomeprint libgnomeprintui gnomepanel 
-			    librsvg fuse gettext intltool
-		];
-		  propagatedBuildInputs = [
-		    libpng libXcomposite libXfixes libXdamage libXrandr libXinerama
-		    libICE libSM startupnotification mesa GConf perl perlXMLParser libxslt
-		    dbus.libs dbus_glib compositeproto fixesproto damageproto randrproto
-		    xineramaproto renderproto kbproto xextproto libXrender xproto libX11
-		    libxcb
-		  ];
-		configureFlags = ["--enable-gtk" "--enable-fuse" 
-			"--enable-annotate" "--enable-librsvg"] ++ 
-			(if args ? extraConfigureFlags then args.extraConfigureFlags else []);
-	};
-	in with localDefs;
-let
-	postAll = fullDepEntry ("
+rec {
+  src = fetchurl {
+      url = "http://releases.compiz-fusion.org/core/compiz-0.8.0.tar.gz";
+      sha256 = "0xhyilfz2cfbdwni774b54171addjqw7hda6j6snzxb1igny7iry";
+    };
+
+  buildInputs = [
+    pkgconfig gtk libwnck GConf libgnome
+    libgnomeui metacity gnomegtk glib pango libglade libgtkhtml
+    gtkhtml libgnomecanvas libgnomeprint libgnomeprintui gnomepanel
+    librsvg fuse gettext intltool binutils
+  ];
+  propagatedBuildInputs = [
+    libpng libXcomposite libXfixes libXdamage libXrandr libXinerama
+    libICE libSM startupnotification mesa GConf perl perlXMLParser libxslt
+    dbus.libs dbus_glib compositeproto fixesproto damageproto randrproto
+    xineramaproto renderproto kbproto xextproto libXrender xproto libX11
+    libxcb
+  ];
+
+  postAll = fullDepEntry ("
     for i in $out/bin/*; do
      patchelf --set-rpath /var/run/opengl-driver/lib:$(patchelf --print-rpath $i) $i
     done
     ensureDir \$out/share/compiz-plugins/
     ln -sfv \$out/lib/compiz \$out/share/compiz-plugins/
-  ") [minInit doMakeInstall defEnsureDir];
-in
+  ") ["minInit" "doMakeInstall" "defEnsureDir"];
 
-stdenv.mkDerivation 
-rec {
-	name = "compiz-0.8.0";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [doPatch doConfigure doMakeInstall doPropagate 
-			doForceShare postAll]);
-	inherit propagatedBuildInputs;
-	meta = {
-		description = "Compiz window manager";
-		inherit src;
-	};
+  configureFlags = ["--enable-gtk" "--enable-fuse"
+          "--enable-annotate" "--enable-librsvg"] ++
+          (if args ? extraConfigureFlags then args.extraConfigureFlags else []);
+
+  /* doConfigure should be specified separately */
+  phaseNames = [ "doPatch" "doConfigure" "doMakeInstall" "doPropagate"
+			"doForceShare" "postAll" ];
+
+  name = "compiz-0.8.0";
+
+  meta = {
+          description = "Compiz window manager";
+          inherit src;
+  };
 }
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 869f2e73d942..12d22fb96371 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6039,10 +6039,10 @@ let
     version = "0.6.2";
   };
 
-  compizBase = composedArgsAndFun (selectVersion ../applications/window-managers/compiz "0.8.0") {
+  compizBase = builderDefsPackage (selectVersion ../applications/window-managers/compiz "0.8.0") {
     inherit lib builderDefs stringsWithDeps;
     inherit fetchurl stdenv pkgconfig libpng mesa perl perlXMLParser libxslt gettext
-      intltool;
+      intltool binutils;
     inherit (xorg) libXcomposite libXfixes libXdamage libXrandr
       libXinerama libICE libSM libXrender xextproto compositeproto fixesproto
       damageproto randrproto xineramaproto renderproto kbproto xproto libX11