Added gdmap, changed builder-defs to use derivation attribute on propagatedBuildInputs, manually fixed Xorg expression problem for Compiz, various fixes.

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

4 files changed, 84 insertions, 2 deletions

diff --git a/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix b/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix
new file mode 100644
index 00000000000..be0db328ef9
--- /dev/null
+++ b/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix
@@ -0,0 +1,39 @@
+args : with args;
+	with builderDefs {
+		src = /* put a fetchurl here */
+			fetchurl {
+				url = mirror://sourceforge/libdbi-drivers/libdbi-drivers-0.8.2-1.tar.gz;
+				sha256 = "1bflwl1k3rf1h8clx3zv5pxnm5hbhq6izikv0phkss3qxkjm61ap";
+			};
+
+		buildInputs = [libdbi]  
+		++(if args ? mysql then [args.mysql] else [])
+		++(if args ? sqlite then [args.sqlite] else [])
+		;
+		configureFlags = [
+			" --enable-libdbi "
+			" --with-dbi-incdir=${libdbi}/include " 
+			" --with-dbi-libdir=${libdbi}/lib " 
+		]
+		++ (if args ? mysql then [
+			" --with-mysql "
+			" --with-mysql-incdir=${mysql}/include/mysql " 
+			" --with-mysql-libdir=${mysql}/lib/mysql " 
+		] else [])
+		++ (if args ? sqlite then [
+			" --with-sqlite "
+			" --with-sqlite-incdir=${sqlite}/include/sqlite " 
+			" --with-sqlite-libdir=${sqlite}/lib/sqlite " 
+		] else [])
+		;
+	} null; /* null is a terminator for sumArgs */
+stdenv.mkDerivation rec {
+	name = "libdbi"+version;
+	builder = writeScript (name + "-builder")
+		(textClosure [doConfigure doMakeInstall doForceShare doPropagate]);
+	meta = {
+		description = "
+	DB independent interface to DB; DB drivers (mysql only for now).
+";
+	};
+}
diff --git a/pkgs/development/libraries/libdbi/0.8.2.nix b/pkgs/development/libraries/libdbi/0.8.2.nix
new file mode 100644
index 00000000000..e7dc24417f2
--- /dev/null
+++ b/pkgs/development/libraries/libdbi/0.8.2.nix
@@ -0,0 +1,21 @@
+args : with args;
+	with builderDefs {
+		src = /* put a fetchurl here */
+			fetchurl {
+				url = mirror://sourceforge/libdbi/libdbi-0.8.2.tar.gz;
+				sha256 = "01zlfv9hd4iv9v1xlh64ajdgx95jb0sjpazavapqc0zwiagwcg4d";
+			};
+
+		buildInputs = [];
+		configureFlags = [];
+	} null; /* null is a terminator for sumArgs */
+stdenv.mkDerivation rec {
+	name = "libdbi"+version;
+	builder = writeScript (name + "-builder")
+		(textClosure [doConfigure doMakeInstall doForceShare doPropagate]);
+	meta = {
+		description = "
+	DB independent interface to DB.	
+";
+	};
+}
diff --git a/pkgs/development/libraries/libextractor/0.5.18.nix b/pkgs/development/libraries/libextractor/0.5.18.nix
new file mode 100644
index 00000000000..3f8304d7304
--- /dev/null
+++ b/pkgs/development/libraries/libextractor/0.5.18.nix
@@ -0,0 +1,21 @@
+args : with args;
+	with builderDefs {
+		src = /* put a fetchurl here */
+		fetchurl {
+			url = http://gnunet.org/libextractor/download/libextractor-0.5.18.tar.gz;
+			sha256 = "09y869zmnr6n2953ra4y7z9m9nj23prlqa4nr4rwcb50dzdmil1k";
+		};
+
+		buildInputs = [ zlib];
+		configureFlags = [];
+	} null; /* null is a terminator for sumArgs */
+stdenv.mkDerivation rec {
+	name = "libextractor"+version;
+	builder = writeScript (name + "-builder")
+		(textClosure [doConfigure doMakeInstall doForceShare doPropagate]);
+	meta = {
+		description = "
+	Libextractor - extracts metadata from files.
+";
+	};
+}
diff --git a/pkgs/development/tools/misc/intltool/0.36.2.nix b/pkgs/development/tools/misc/intltool/0.36.2.nix
index f42a6901dfa..d8315a9ba62 100644
--- a/pkgs/development/tools/misc/intltool/0.36.2.nix
+++ b/pkgs/development/tools/misc/intltool/0.36.2.nix
@@ -6,13 +6,14 @@ args : with args;
 		sha256 = "0cfblqz3k5s4rsw6rx9f5v3izsrmrs96293rb7bd02vijbah9gxj";
 	};
 
-		buildInputs = [perl perlXMLParser];
+		propagatedBuildInputs = [perl perlXMLParser];
 		configureFlags = [];
 	} null; /* null is a terminator for sumArgs */
 stdenv.mkDerivation rec {
 	name = "intltool-0.36.2";
 	builder = writeScript (name + "-builder")
-		(textClosure [doConfigure doMakeInstall doForceShare]);
+		(textClosure [doConfigure doMakeInstall doPropagate doForceShare]);
+	inherit propagatedBuildInputs;
 	meta = {
 		description = "
 	Internalization tool for XML.