Added Compiz Fusion (main plugins). Also some dependencies, and made wmii build under setup-new-2.sh also.

svn path=/nixpkgs/trunk/; revision=9577

5 files changed, 48 insertions, 1 deletions

diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix
new file mode 100644
index 00000000000..581edf53d6e
--- /dev/null
+++ b/pkgs/development/interpreters/pyrex/0.9.6.nix
@@ -0,0 +1,21 @@
+args : with args;
+	with builderDefs {
+		src = /* put a fetchurl here */
+	fetchurl {
+		url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.6.tar.gz;
+		sha256 = "1i0mrv2a3ihnj5mjf07aic7nlps9qap57j477m8ajwhhwx9vwlxy";
+	};
+		buildInputs = [python];
+		configureFlags = [];
+	} null; /* null is a terminator for sumArgs */
+	with stringsWithDeps;
+stdenv.mkDerivation rec {
+	name = "Pyrex-"+version;
+	builder = writeScript (name + "-builder")
+		(textClosure [installPythonPackage doForceShare]);
+	meta = {
+		description = "
+	Python package compiler or something like that.	
+";
+	};
+}
diff --git a/pkgs/development/interpreters/pyrex/default.nix b/pkgs/development/interpreters/pyrex/default.nix
new file mode 100644
index 00000000000..c8e4bcf9545
--- /dev/null
+++ b/pkgs/development/interpreters/pyrex/default.nix
@@ -0,0 +1,2 @@
+args : 
+(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args
diff --git a/pkgs/development/libraries/libixp_for_wmii/default.nix b/pkgs/development/libraries/libixp_for_wmii/default.nix
index 7461f76d235..c26bf7dfc6c 100644
--- a/pkgs/development/libraries/libixp_for_wmii/default.nix
+++ b/pkgs/development/libraries/libixp_for_wmii/default.nix
@@ -1,7 +1,7 @@
 args: with args;
 stdenv.mkDerivation {
   name = "libixp_for_wmii";
-  phases = "installPhase";
+  phases = (if args.includeUnpack then "unpackPhase " else "")+"installPhase";
   installPhase = "
 
      export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g')
diff --git a/pkgs/development/tools/misc/intltool/0.36.2.nix b/pkgs/development/tools/misc/intltool/0.36.2.nix
new file mode 100644
index 00000000000..f561813abc1
--- /dev/null
+++ b/pkgs/development/tools/misc/intltool/0.36.2.nix
@@ -0,0 +1,22 @@
+args : with args;
+	with builderDefs {
+		src = /* put a fetchurl here */
+	fetchurl {
+		url = http://ftp.gnome.org/pub/gnome/sources/intltool/0.36/intltool-0.36.2.tar.bz2;
+		sha256 = "0cfblqz3k5s4rsw6rx9f5v3izsrmrs96293rb7bd02vijbah9gxj";
+	};
+
+		buildInputs = [perl perlXMLParser];
+		configureFlags = [];
+	} null; /* null is a terminator for sumArgs */
+	with stringsWithDeps;
+stdenv.mkDerivation rec {
+	name = "intltool-0.36.2";
+	builder = writeScript (name + "-builder")
+		(textClosure [doConfigure doMakeInstall doForceShare]);
+	meta = {
+		description = "
+	Internalization tool for XML.
+";
+	};
+}
diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix
new file mode 100644
index 00000000000..c8e4bcf9545
--- /dev/null
+++ b/pkgs/development/tools/misc/intltool/default.nix
@@ -0,0 +1,2 @@
+args : 
+(import (__toPath ((toString ./JustNothing/.. )+"/"+args.version+".nix"))) args