From 3ef5e62b2f10531d66c1b01a25c696cf8ede3165 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 5 Nov 2007 16:07:35 +0000
Subject: [PATCH] Some fixes to CompizFusion. With proper ~-setup works now.

svn path=/nixpkgs/trunk/; revision=9585
---
 .../compiz-fusion/compizconfig-python/0.6.0.nix              | 2 +-
 .../window-managers/compiz-fusion/config-backend/0.6.0.nix   | 5 +++--
 pkgs/applications/window-managers/compiz-fusion/default.nix  | 4 ++--
 pkgs/top-level/template-composing-builder.nix                | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.6.0.nix b/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.6.0.nix
index 9b31bfe928ca..dcb0028b742a 100644
--- a/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.6.0.nix
+++ b/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.6.0.nix
@@ -6,7 +6,7 @@ args : with args;
 		sha256 = "0im67mxnm30a3xd3rvfwrgfp4ic2x5axpjdahx0f5p9pnfy0jm4n";
 	};
 		buildInputs = (import ../general-dependencies.nix args) ++
-			[libcompizconfig bcop python pyrex];
+			[libcompizconfig bcop python pyrex configBackendGConf];
 		configureFlags = [];
 	} null; /* null is a terminator for sumArgs */
 	with stringsWithDeps;
diff --git a/pkgs/applications/window-managers/compiz-fusion/config-backend/0.6.0.nix b/pkgs/applications/window-managers/compiz-fusion/config-backend/0.6.0.nix
index 88fe0ed0b9f3..23a18b4d1d0e 100644
--- a/pkgs/applications/window-managers/compiz-fusion/config-backend/0.6.0.nix
+++ b/pkgs/applications/window-managers/compiz-fusion/config-backend/0.6.0.nix
@@ -6,14 +6,15 @@ args : with args;
 		sha256 = "0h0r9sicc4pla5vag0j5qkllyagbs8dv5ai7fga48ln7q35y2mjr";
 	};
 		buildInputs = (import ../general-dependencies.nix args) ++
-			[libcompizconfig bcop];
+			[bcop libcompizconfig];
 		configureFlags = [];
+		forceShare = ["man" "doc" "info" "lib/compizconfig"];
 	} null; /* null is a terminator for sumArgs */
 	with stringsWithDeps;
 stdenv.mkDerivation rec {
 	name = "compizconfig-backend-GConf-"+version;
 	builder = writeScript (name + "-builder")
-		(textClosure [doAutotools doConfigure doMakeInstall doForceShare]);
+		(textClosure [doAutotools doConfigure doMakeInstall doForceShare doPropagate]);
 	meta = {
 		description = "
 	Compiz configuration backend (GConf).
diff --git a/pkgs/applications/window-managers/compiz-fusion/default.nix b/pkgs/applications/window-managers/compiz-fusion/default.nix
index f1bf1ce83089..9fadd9e4fe6f 100644
--- a/pkgs/applications/window-managers/compiz-fusion/default.nix
+++ b/pkgs/applications/window-managers/compiz-fusion/default.nix
@@ -3,9 +3,9 @@ rec
 {
 	bcop = import ./bcop args;
 	libcompizconfig = import ./libcompizconfig (args // {inherit bcop;});
-	configBackendGConf = import ./config-backend (args // {inherit libcompizconfig bcop;});
+	configBackendGConf = import ./config-backend (args // {inherit bcop libcompizconfig;});
 	compizConfigPython = import ./compizconfig-python (args // {inherit libcompizconfig 
-		bcop pyrex;});
+		bcop pyrex configBackendGConf;});
 	ccsm = import ./ccsm (args // {inherit libcompizconfig bcop compizConfigPython configBackendGConf;});
 	pluginsMain = import ./main (args //{inherit bcop ;});
 	compizManager = import ./compiz-manager (args // {inherit bcop ccsm;});
diff --git a/pkgs/top-level/template-composing-builder.nix b/pkgs/top-level/template-composing-builder.nix
index a652da024459..f2995f0c60d5 100644
--- a/pkgs/top-level/template-composing-builder.nix
+++ b/pkgs/top-level/template-composing-builder.nix
@@ -9,7 +9,7 @@ args : with args;
 stdenv.mkDerivation rec {
 	name = "${abort "Specify name"}";
 	builder = writeScript (name + "-builder")
-		(textClosure [(abort "Specify phases - defined here or in builderDefs")]);
+		(textClosure [(abort "Specify phases - defined here or in builderDefs") doForceShare doPropagate]);
 	meta = {
 		description = "
 		${abort "Write a description"}