From 1029a2a4dab22e140a0d89fdc110ed3f97e9b09e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 5 Nov 2007 17:14:10 +0000
Subject: [PATCH] Added Compiz Fusion extra.

svn path=/nixpkgs/trunk/; revision=9586
---
 .../window-managers/compiz-fusion/default.nix |  1 +
 .../compiz-fusion/extra/0.6.0.nix             | 32 +++++++++++++++++++
 .../compiz-fusion/extra/default.nix           |  2 ++
 3 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/window-managers/compiz-fusion/extra/0.6.0.nix
 create mode 100644 pkgs/applications/window-managers/compiz-fusion/extra/default.nix

diff --git a/pkgs/applications/window-managers/compiz-fusion/default.nix b/pkgs/applications/window-managers/compiz-fusion/default.nix
index 9fadd9e4fe6f..156d3d281d7d 100644
--- a/pkgs/applications/window-managers/compiz-fusion/default.nix
+++ b/pkgs/applications/window-managers/compiz-fusion/default.nix
@@ -8,5 +8,6 @@ rec
 		bcop pyrex configBackendGConf;});
 	ccsm = import ./ccsm (args // {inherit libcompizconfig bcop compizConfigPython configBackendGConf;});
 	pluginsMain = import ./main (args //{inherit bcop ;});
+	pluginsExtra = import ./extra (args //{inherit bcop pluginsMain;});
 	compizManager = import ./compiz-manager (args // {inherit bcop ccsm;});
 }
diff --git a/pkgs/applications/window-managers/compiz-fusion/extra/0.6.0.nix b/pkgs/applications/window-managers/compiz-fusion/extra/0.6.0.nix
new file mode 100644
index 000000000000..9fa90f260d18
--- /dev/null
+++ b/pkgs/applications/window-managers/compiz-fusion/extra/0.6.0.nix
@@ -0,0 +1,32 @@
+args : with args;
+	with builderDefs {
+		src = /* put a fetchurl here */
+	fetchurl {
+		url = http://releases.compiz-fusion.org/0.6.0/compiz-fusion-plugins-extra-0.6.0.tar.bz2;
+		sha256 = "1k8477x1f27qbwvgp5pws81i50kbihk8mcqxbjjqv9i7scvaddvy";
+	};
+		buildInputs = (import ../general-dependencies.nix args)++
+		[bcop libjpeg gettext pluginsMain];
+		configureFlags = [];
+	} null; /* null is a terminator for sumArgs */
+	with stringsWithDeps;
+let
+	sharePlugins = FullDepEntry ("
+		ensureDir \$out/share/compiz-plugins
+		ln -vsf \$out/lib/compiz \$out/share/compiz-plugins
+	") [minInit doMakeInstall defEnsureDir];
+	fixIncludes = FullDepEntry ("
+sed -e 's@#include <text.h>@#include <compiz/text.h>@' -i src/group/group-internal.h;
+sed -e 's@#include <text.h>@#include <compiz/text.h>@' -i src/scalefilter/scalefilter.c;
+	") [minInit doUnpack];
+in
+stdenv.mkDerivation rec {
+	name = "compiz-fusion-plugins-extra-"+version;
+	builder = writeScript (name + "-builder")
+		(textClosure [fixIncludes doConfigure doMakeInstall sharePlugins doForceShare]);
+	meta = {
+		description = "
+	Extra Compiz Fusion plugins.
+";
+	};
+}
diff --git a/pkgs/applications/window-managers/compiz-fusion/extra/default.nix b/pkgs/applications/window-managers/compiz-fusion/extra/default.nix
new file mode 100644
index 000000000000..c8e4bcf95456
--- /dev/null
+++ b/pkgs/applications/window-managers/compiz-fusion/extra/default.nix
@@ -0,0 +1,2 @@
+args : 
+(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args