meta.function -> passthru.function, not killing other contents of passthru

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

26 files changed, 26 insertions, 26 deletions

diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 644996065cd..adb8e170feb 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -1,5 +1,5 @@
 args: with args;
-	let localDefs = builderDefs.meta.function { 
+	let localDefs = builderDefs.passthru.function { 
 	  src = 
 		fetchurl {
 			url = mirror://sourceforge/audacity/audacity-src-1.3.3.tar.gz;
diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix
index 230ee1d7de2..8dd783a2d1a 100644
--- a/pkgs/applications/audio/ladspa-plugins/default.nix
+++ b/pkgs/applications/audio/ladspa-plugins/default.nix
@@ -1,5 +1,5 @@
 args: with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = 
 		fetchurl {
 			url = http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz;
diff --git a/pkgs/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-plugins/ladspah.nix
index 60ee6fbf457..dd328608155 100644
--- a/pkgs/applications/audio/ladspa-plugins/ladspah.nix
+++ b/pkgs/applications/audio/ladspa-plugins/ladspah.nix
@@ -6,7 +6,7 @@ let
 		sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67";
 	};
 in
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		buildInputs = [];
 		inherit src;
 	};
diff --git a/pkgs/applications/graphics/gocr/0.44.nix b/pkgs/applications/graphics/gocr/0.44.nix
index 0a3c3869a1c..7273c5d98c3 100644
--- a/pkgs/applications/graphics/gocr/0.44.nix
+++ b/pkgs/applications/graphics/gocr/0.44.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 fetchurl {
 		url = http://prdownloads.sourceforge.net/jocr/gocr-0.44.tar.gz;
diff --git a/pkgs/applications/graphics/xscreensaver/default.nix b/pkgs/applications/graphics/xscreensaver/default.nix
index b5981fa6dd0..5c779e5e1b6 100644
--- a/pkgs/applications/graphics/xscreensaver/default.nix
+++ b/pkgs/applications/graphics/xscreensaver/default.nix
@@ -1,4 +1,4 @@
-args : with args; let localDefs = builderDefs.meta.function (args // rec {
+args : with args; let localDefs = builderDefs.passthru.function (args // rec {
                 version = lib.getAttr ["version"] "5.07" args;
 		src = /* put a fetchurl here */
 		fetchurl {
diff --git a/pkgs/applications/networking/p2p/ldcpp/1.0.1.nix b/pkgs/applications/networking/p2p/ldcpp/1.0.1.nix
index 00626377e7c..07e4a305060 100644
--- a/pkgs/applications/networking/p2p/ldcpp/1.0.1.nix
+++ b/pkgs/applications/networking/p2p/ldcpp/1.0.1.nix
@@ -1,5 +1,5 @@
 args : with args; with builderDefs;
-	let localDefs = builderDefs.meta.function ((rec {
+	let localDefs = builderDefs.passthru.function ((rec {
 		src = /* put a fetchurl here */
 		fetchurl {
 			url = http://download2.berlios.de/linuxdcpp/linuxdcpp-1.0.1.tar.bz2;
diff --git a/pkgs/applications/virtualization/qemu/linux-img/0.2.nix b/pkgs/applications/virtualization/qemu/linux-img/0.2.nix
index 87e2e114bec..e8532caddd2 100644
--- a/pkgs/applications/virtualization/qemu/linux-img/0.2.nix
+++ b/pkgs/applications/virtualization/qemu/linux-img/0.2.nix
@@ -1,6 +1,6 @@
 
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 		fetchurl {
 			url = [ http://fabrice.bellard.free.fr/qemu/linux-0.2.img.bz2 http://bellard.org/qemu/linux-0.2.img.bz2];
diff --git a/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.4.nix
index 22748965228..9f516398b45 100644
--- a/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.4.nix
+++ b/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.4.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.4/compiz-bcop-0.7.4.tar.bz2;
diff --git a/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix
index d2920c6a789..e9bede0a287 100644
--- a/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix
+++ b/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.8/compiz-bcop-0.7.8.tar.bz2;
diff --git a/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.4.nix
index 768dc7fca86..6ec5257cc2d 100644
--- a/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.4.nix
+++ b/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.4.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.4/simple-ccsm-0.7.4.tar.bz2;
diff --git a/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.8.nix
index 3222572b689..d739b54a534 100644
--- a/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.8.nix
+++ b/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.8.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.8/simple-ccsm-0.7.8.tar.bz2;
diff --git a/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.4.nix
index 609ed4d39ec..a6761ad9ae5 100644
--- a/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.4.nix
+++ b/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.4.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.4/ccsm-0.7.4.tar.bz2;
diff --git a/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.8.nix
index 236b605ab0f..385819afd4c 100644
--- a/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.8.nix
+++ b/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.8.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.8/ccsm-0.7.8.tar.bz2;
diff --git a/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.4.nix
index 47aac2d0bba..39cf12d31da 100644
--- a/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.4.nix
+++ b/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.4.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.4/compizconfig-python-0.7.4.tar.bz2;
diff --git a/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.8.nix
index 5d7311896f1..d92349e238b 100644
--- a/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.8.nix
+++ b/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.8.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.8/compizconfig-python-0.7.8.tar.bz2;
diff --git a/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.4.nix
index cc9746efaaa..91a811e72cb 100644
--- a/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.4.nix
+++ b/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.4.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.4/compizconfig-backend-gconf-0.7.4.tar.bz2;
diff --git a/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.8.nix
index f900dbb48a1..f6f1f1545b0 100644
--- a/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.8.nix
+++ b/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.8.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.8/compizconfig-backend-gconf-0.7.8.tar.bz2;
diff --git a/pkgs/applications/window-managers/compiz-fusion/extra/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/extra/0.7.4.nix
index 4334b787e35..efaec0c8731 100644
--- a/pkgs/applications/window-managers/compiz-fusion/extra/0.7.4.nix
+++ b/pkgs/applications/window-managers/compiz-fusion/extra/0.7.4.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.4/compiz-fusion-plugins-extra-0.7.4.tar.bz2;
diff --git a/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix
index 17c580eb743..39108fab204 100644
--- a/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix
+++ b/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.8/compiz-fusion-plugins-extra-0.7.8.tar.bz2;
diff --git a/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.4.nix
index 12c83210ce6..dd631b79b66 100644
--- a/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.4.nix
+++ b/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.4.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.4/libcompizconfig-0.7.4.tar.bz2;
diff --git a/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.8.nix
index 86ea28c098e..0ea38bd4520 100644
--- a/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.8.nix
+++ b/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.8.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.8/libcompizconfig-0.7.8.tar.bz2;
diff --git a/pkgs/applications/window-managers/compiz-fusion/main/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/main/0.7.4.nix
index 08e2c96eb6c..a50a4e03c3f 100644
--- a/pkgs/applications/window-managers/compiz-fusion/main/0.7.4.nix
+++ b/pkgs/applications/window-managers/compiz-fusion/main/0.7.4.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.4/compiz-fusion-plugins-main-0.7.4.tar.bz2;
diff --git a/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix
index abff605d166..5fae889fd3e 100644
--- a/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix
+++ b/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/0.7.8/compiz-fusion-plugins-main-0.7.8.tar.bz2;
diff --git a/pkgs/applications/window-managers/compiz/0.6.2.nix b/pkgs/applications/window-managers/compiz/0.6.2.nix
index 213fc810ddf..9531fdc3f6d 100644
--- a/pkgs/applications/window-managers/compiz/0.6.2.nix
+++ b/pkgs/applications/window-managers/compiz/0.6.2.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://releases.compiz-fusion.org/compiz/0.6.2/compiz-0.6.2.tar.bz2;
diff --git a/pkgs/applications/window-managers/compiz/0.7.8.nix b/pkgs/applications/window-managers/compiz/0.7.8.nix
index a7e700af4ea..e6447b68bdb 100644
--- a/pkgs/applications/window-managers/compiz/0.7.8.nix
+++ b/pkgs/applications/window-managers/compiz/0.7.8.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://xorg.freedesktop.org/archive/individual/app/compiz-0.7.8.tar.gz;
diff --git a/pkgs/applications/window-managers/fbpanel/4.12.nix b/pkgs/applications/window-managers/fbpanel/4.12.nix
index cf09e347a5d..b4d83d9d1d0 100644
--- a/pkgs/applications/window-managers/fbpanel/4.12.nix
+++ b/pkgs/applications/window-managers/fbpanel/4.12.nix
@@ -1,5 +1,5 @@
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 	fetchurl {
 		url = http://garr.dl.sourceforge.net/sourceforge/fbpanel/fbpanel-4.12.tgz;