From 82e678362f25dfefd8c9952e4fa1ab3c1aca9ce6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 5 Dec 2005 14:11:09 +0000
Subject: [PATCH] * "." -> "source".

svn path=/nixpkgs/trunk/; revision=4335
---
 pkgs/applications/editors/emacs/builder.sh                | 2 +-
 pkgs/applications/editors/emacs/modes/cua/builder.sh      | 2 +-
 pkgs/applications/editors/emacs/modes/haskell/builder.sh  | 2 +-
 pkgs/applications/editors/emacs/modes/nxml/builder.sh     | 2 +-
 pkgs/applications/editors/monodevelop/builder.sh          | 4 ++--
 pkgs/applications/editors/monodoc/builder.sh              | 4 ++--
 pkgs/applications/editors/vim/builder.sh                  | 2 +-
 pkgs/applications/graphics/batik/builder.sh               | 2 +-
 pkgs/applications/graphics/f-spot/builder.sh              | 4 ++--
 pkgs/applications/misc/acrobat-reader/builder.sh          | 2 +-
 pkgs/applications/misc/hello/ex-1/builder.sh              | 2 +-
 .../networking/browsers/firefox-wrapper/builder.sh        | 4 ++--
 pkgs/applications/networking/browsers/firefox/builder.sh  | 4 ++--
 .../browsers/mozilla-plugins/flashplayer/builder.sh       | 2 +-
 .../browsers/mozilla-plugins/mplayerplug-in/builder.sh    | 2 +-
 pkgs/applications/networking/browsers/mozilla/builder.sh  | 2 +-
 pkgs/applications/networking/browsers/w3m/builder.sh      | 2 +-
 .../networking/instant-messengers/gaim/builder.sh         | 2 +-
 .../networking/mailreaders/thunderbird/builder.sh         | 2 +-
 .../version-management/subversion-1.1.x/builder.sh        | 2 +-
 .../version-management/subversion-1.2.x/builder.sh        | 2 +-
 pkgs/applications/video/MPlayer/builder.sh                | 2 +-
 pkgs/applications/video/MPlayer/win32codecs/builder.sh    | 2 +-
 pkgs/applications/video/RealPlayer/builder.sh             | 4 ++--
 pkgs/applications/video/mythtv/builder.sh                 | 2 +-
 pkgs/applications/video/zapping/builder.sh                | 2 +-
 pkgs/build-support/fetchfile/builder.sh                   | 2 +-
 pkgs/build-support/fetchsvn/builder.sh                    | 2 +-
 pkgs/build-support/fetchurl/builder.sh                    | 2 +-
 pkgs/build-support/gcc-cross-wrapper/builder.sh           | 4 ++--
 pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh       | 8 ++++----
 pkgs/build-support/gcc-cross-wrapper/ld-wrapper.sh        | 8 ++++----
 pkgs/build-support/gcc-wrapper/builder.sh                 | 4 ++--
 pkgs/build-support/gcc-wrapper/gcc-wrapper.sh             | 8 ++++----
 pkgs/build-support/gcc-wrapper/ld-wrapper.sh              | 8 ++++----
 pkgs/build-support/make-symlinks/builder.sh               | 2 +-
 pkgs/build-support/mono-dll-fixer/builder.sh              | 4 ++--
 pkgs/data/sgml+xml/schemas/docbook-ng/builder.sh          | 2 +-
 pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/builder.sh | 2 +-
 pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/builder.sh | 2 +-
 .../data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh | 2 +-
 pkgs/data/sgml+xml/stylesheets/xslt/docbook/builder.sh    | 2 +-
 pkgs/development/compilers/blackdown/builder.sh           | 2 +-
 pkgs/development/compilers/gcc-2.95/builder.sh            | 2 +-
 pkgs/development/compilers/gcc-3.3/builder.sh             | 2 +-
 pkgs/development/compilers/gcc-3.4-arm/builder.sh         | 2 +-
 pkgs/development/compilers/gcc-3.4/builder.sh             | 2 +-
 pkgs/development/compilers/gcc-4.0-arm/builder.sh         | 2 +-
 pkgs/development/compilers/gcc-4.0/builder.sh             | 2 +-
 pkgs/development/compilers/gcc-static-3.4/builder.sh      | 2 +-
 .../development/compilers/gwydion-dylan/binary-builder.sh | 2 +-
 pkgs/development/compilers/gwydion-dylan/builder.sh       | 2 +-
 pkgs/development/compilers/harp/builder.sh                | 2 +-
 pkgs/development/compilers/helium/builder.sh              | 2 +-
 pkgs/development/compilers/nasm/builder.sh                | 2 +-
 pkgs/development/compilers/ocaml/builder.sh               | 2 +-
 pkgs/development/compilers/strategoxt/builder.sh          | 2 +-
 pkgs/development/compilers/tiger/builder.sh               | 2 +-
 pkgs/development/eclipse/ecj/builder.sh                   | 2 +-
 pkgs/development/eclipse/jdt-sdk/builder.sh               | 2 +-
 pkgs/development/interpreters/clisp/builder.sh            | 2 +-
 pkgs/development/interpreters/jre/builder.sh              | 2 +-
 pkgs/development/interpreters/kaffe/builder.sh            | 2 +-
 pkgs/development/interpreters/perl/builder.sh             | 2 +-
 pkgs/development/interpreters/php/builder.sh              | 2 +-
 pkgs/development/interpreters/sys-perl/builder.sh         | 2 +-
 pkgs/development/libraries/audiofile/builder.sh           | 2 +-
 pkgs/development/libraries/chmlib/builder.sh              | 2 +-
 pkgs/development/libraries/db4/builder.sh                 | 2 +-
 pkgs/development/libraries/fontconfig/builder.sh          | 2 +-
 pkgs/development/libraries/glibc/builder.sh               | 4 ++--
 pkgs/development/libraries/gnome/gnome-vfs/builder.sh     | 2 +-
 pkgs/development/libraries/gnome/scrollkeeper/builder.sh  | 2 +-
 pkgs/development/libraries/gtk-libs-1.x/gtk+/builder.sh   | 2 +-
 pkgs/development/libraries/gtk-sharp-1/builder.sh         | 2 +-
 pkgs/development/libraries/gtk-sharp-2/builder.sh         | 2 +-
 pkgs/development/libraries/gtkmozembed-sharp/builder.sh   | 2 +-
 pkgs/development/libraries/gtksourceview-sharp/builder.sh | 2 +-
 pkgs/development/libraries/java/cup/builder.sh            | 2 +-
 pkgs/development/libraries/java/httpunit/builder.sh       | 2 +-
 pkgs/development/libraries/java/jakarta-bcel/builder.sh   | 2 +-
 .../libraries/java/jakarta-commons/file-upload/builder.sh | 2 +-
 .../libraries/java/jakarta-regexp/java-bin-builder.sh     | 2 +-
 pkgs/development/libraries/java/javasvn/builder.sh        | 2 +-
 pkgs/development/libraries/java/jdom/builder.sh           | 2 +-
 pkgs/development/libraries/java/jflex/builder.sh          | 2 +-
 pkgs/development/libraries/java/junit/builder.sh          | 2 +-
 pkgs/development/libraries/java/lucene/builder.sh         | 2 +-
 pkgs/development/libraries/java/mockobjects/builder.sh    | 2 +-
 pkgs/development/libraries/java/saxon/unzip-builder.sh    | 2 +-
 pkgs/development/libraries/libdvdread/builder.sh          | 2 +-
 pkgs/development/libraries/libjpeg/builder.sh             | 2 +-
 pkgs/development/libraries/libtiff/builder.sh             | 2 +-
 pkgs/development/libraries/libxml2/builder.sh             | 2 +-
 pkgs/development/libraries/mesa/builder.sh                | 2 +-
 pkgs/development/libraries/nss/builder.sh                 | 2 +-
 pkgs/development/libraries/openssl-0.9.8/builder.sh       | 2 +-
 pkgs/development/libraries/openssl/builder.sh             | 2 +-
 pkgs/development/libraries/popt/builder.sh                | 2 +-
 pkgs/development/libraries/qt-3/builder.sh                | 4 ++--
 pkgs/development/libraries/readline/builder.sh            | 2 +-
 pkgs/development/libraries/xine-lib/builder.sh            | 2 +-
 pkgs/development/libraries/xlibs/xlibs/builder.sh         | 2 +-
 pkgs/development/perl-modules/generic/builder.sh          | 8 ++++----
 pkgs/development/python-modules/wxPython-2.5/builder.sh   | 2 +-
 pkgs/development/python-modules/wxPython/builder.sh       | 2 +-
 .../tools/build-managers/apache-ant/builder.sh            | 2 +-
 .../tools/build-managers/apache-ant/core-builder.sh       | 2 +-
 pkgs/development/tools/documentation/xdoc/builder.sh      | 2 +-
 pkgs/development/tools/java/jclasslib/builder.sh          | 2 +-
 pkgs/development/tools/misc/automake/builder.sh           | 2 +-
 pkgs/development/tools/misc/binutils-arm/builder.sh       | 2 +-
 pkgs/development/tools/misc/binutils/builder.sh           | 2 +-
 pkgs/development/tools/misc/gperf/builder.sh              | 2 +-
 pkgs/development/tools/misc/lcov/builder.sh               | 2 +-
 pkgs/development/tools/misc/pkgconfig/builder.sh          | 2 +-
 pkgs/development/tools/misc/strace/builder.sh             | 2 +-
 pkgs/development/tools/misc/swig/builder.sh               | 2 +-
 pkgs/development/tools/parsing/asc-support/builder.sh     | 2 +-
 pkgs/development/tools/parsing/asf-support/builder.sh     | 2 +-
 pkgs/development/tools/parsing/error-support/builder.sh   | 2 +-
 pkgs/development/tools/parsing/flex-iputils/builder.sh    | 2 +-
 pkgs/development/tools/parsing/pgen/builder.sh            | 2 +-
 pkgs/development/tools/parsing/pt-support/builder.sh      | 2 +-
 pkgs/development/tools/parsing/sdf-support/builder.sh     | 2 +-
 pkgs/development/tools/parsing/sdf/builder.sh             | 2 +-
 pkgs/development/tools/parsing/sglr/builder.sh            | 2 +-
 pkgs/games/quake3demo/builder.sh                          | 2 +-
 pkgs/games/quake3demo/make-wrapper.sh                     | 2 +-
 pkgs/games/ut2004demo/builder.sh                          | 2 +-
 pkgs/games/ut2004demo/make-wrapper.sh                     | 2 +-
 pkgs/misc/ghostscript/builder.sh                          | 2 +-
 pkgs/misc/nix/builder.sh                                  | 2 +-
 pkgs/misc/tex/nix/animatedot.sh                           | 2 +-
 pkgs/misc/tex/nix/dot2pdf.sh                              | 2 +-
 pkgs/misc/tex/nix/run-latex.sh                            | 2 +-
 pkgs/misc/tex/tetex/builder.sh                            | 2 +-
 pkgs/misc/uml-utilities/builder.sh                        | 2 +-
 pkgs/misc/uml/builder.sh                                  | 4 ++--
 pkgs/os-specific/linux/dietlibc-wrapper/builder.sh        | 2 +-
 pkgs/os-specific/linux/dietlibc/builder.sh                | 2 +-
 pkgs/os-specific/linux/e2fsprogs-diet/builder.sh          | 2 +-
 pkgs/os-specific/linux/e2fsprogs/builder.sh               | 2 +-
 pkgs/os-specific/linux/iputils/builder.sh                 | 2 +-
 pkgs/os-specific/linux/kernel-headers-arm/builder.sh      | 2 +-
 pkgs/os-specific/linux/kernel-headers/builder.sh          | 2 +-
 pkgs/os-specific/linux/kernel/builder.sh                  | 2 +-
 pkgs/os-specific/linux/klibc/builder.sh                   | 2 +-
 pkgs/os-specific/linux/mingetty-wrapper/builder.sh        | 2 +-
 pkgs/os-specific/linux/mingetty/builder.sh                | 2 +-
 pkgs/os-specific/linux/net-tools/builder.sh               | 2 +-
 pkgs/os-specific/linux/procps/builder.sh                  | 2 +-
 pkgs/os-specific/linux/shadow/builder.sh                  | 2 +-
 pkgs/os-specific/linux/syslinux/builder.sh                | 2 +-
 pkgs/os-specific/linux/util-linux/builder.sh              | 2 +-
 pkgs/servers/ftp/vsftpd/builder.sh                        | 2 +-
 pkgs/servers/http/apache-httpd/builder.sh                 | 2 +-
 pkgs/servers/http/jetty/bin-builder.sh                    | 2 +-
 pkgs/servers/http/tomcat/builder.sh                       | 2 +-
 pkgs/servers/sql/postgresql/builder.sh                    | 2 +-
 pkgs/servers/sql/postgresql/jdbc/builder.sh               | 2 +-
 pkgs/shells/bash/builder.sh                               | 2 +-
 pkgs/stdenv/generic/builder.sh                            | 4 ++--
 pkgs/stdenv/generic/default-builder.sh                    | 2 +-
 pkgs/stdenv/generic/setup.sh                              | 8 ++++----
 pkgs/test/rpath/builder.sh                                | 2 +-
 pkgs/test/simple/builder.sh                               | 2 +-
 pkgs/tools/archivers/unzip/builder.sh                     | 2 +-
 pkgs/tools/archivers/zip/builder.sh                       | 2 +-
 pkgs/tools/compression/bsdiff/builder.sh                  | 2 +-
 pkgs/tools/compression/bzip2/builder.sh                   | 2 +-
 pkgs/tools/compression/zdelta/builder.sh                  | 2 +-
 pkgs/tools/graphics/graphviz/builder.sh                   | 2 +-
 pkgs/tools/misc/findutils-wrapper/builder.sh              | 4 ++--
 pkgs/tools/misc/getopt/builder.sh                         | 2 +-
 pkgs/tools/misc/grub-wrapper/builder.sh                   | 4 ++--
 pkgs/tools/misc/less/builder.sh                           | 2 +-
 pkgs/tools/misc/screen/builder.sh                         | 2 +-
 pkgs/tools/networking/bittorrent/builder.sh               | 4 ++--
 pkgs/tools/networking/cksfv/builder.sh                    | 2 +-
 pkgs/tools/networking/dhcp-wrapper/builder.sh             | 4 ++--
 pkgs/tools/networking/dhcp/builder.sh                     | 2 +-
 pkgs/tools/networking/openssh/builder.sh                  | 2 +-
 pkgs/tools/networking/par2cmdline/builder.sh              | 2 +-
 pkgs/tools/security/gnupg/builder.sh                      | 2 +-
 pkgs/tools/security/mktemp/builder.sh                     | 2 +-
 pkgs/tools/security/nmap/builder.sh                       | 2 +-
 pkgs/tools/system/which/builder.sh                        | 2 +-
 pkgs/tools/text/diffutils/builder.sh                      | 2 +-
 pkgs/tools/text/ed/builder.sh                             | 2 +-
 pkgs/tools/text/gnupatch/builder.sh                       | 2 +-
 pkgs/tools/text/xml/jing/script-builder.sh                | 2 +-
 pkgs/tools/text/xml/jing/unzip-builder.sh                 | 2 +-
 pkgs/tools/typesetting/bibtex-tools/builder.sh            | 2 +-
 pkgs/tools/typesetting/hevea/builder.sh                   | 2 +-
 195 files changed, 230 insertions(+), 230 deletions(-)

diff --git a/pkgs/applications/editors/emacs/builder.sh b/pkgs/applications/editors/emacs/builder.sh
index fa3516556a60..a59f4d45f4a7 100644
--- a/pkgs/applications/editors/emacs/builder.sh
+++ b/pkgs/applications/editors/emacs/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 myglibc=`cat ${NIX_GCC}/nix-support/orig-glibc`
 echo "glibc: $myglibc" 
diff --git a/pkgs/applications/editors/emacs/modes/cua/builder.sh b/pkgs/applications/editors/emacs/modes/cua/builder.sh
index 479156fdfa21..6f7bb428c1a6 100644
--- a/pkgs/applications/editors/emacs/modes/cua/builder.sh
+++ b/pkgs/applications/editors/emacs/modes/cua/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 mkdir -p $out/emacs/site-lisp
 cp $src $out/emacs/site-lisp/cua.el
diff --git a/pkgs/applications/editors/emacs/modes/haskell/builder.sh b/pkgs/applications/editors/emacs/modes/haskell/builder.sh
index fff90a5d69cd..2d1540319944 100644
--- a/pkgs/applications/editors/emacs/modes/haskell/builder.sh
+++ b/pkgs/applications/editors/emacs/modes/haskell/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 mkdir -p $out/emacs/site-lisp
 tar zxvf $src
diff --git a/pkgs/applications/editors/emacs/modes/nxml/builder.sh b/pkgs/applications/editors/emacs/modes/nxml/builder.sh
index 6e01594aefb6..d2393362ebb6 100644
--- a/pkgs/applications/editors/emacs/modes/nxml/builder.sh
+++ b/pkgs/applications/editors/emacs/modes/nxml/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 mkdir -p $out/emacs/site-lisp
 cd $out/emacs/site-lisp
diff --git a/pkgs/applications/editors/monodevelop/builder.sh b/pkgs/applications/editors/monodevelop/builder.sh
index 930cc475aa81..a4f6edad04c3 100644
--- a/pkgs/applications/editors/monodevelop/builder.sh
+++ b/pkgs/applications/editors/monodevelop/builder.sh
@@ -1,5 +1,5 @@
-. $stdenv/setup
-. $makeWrapper
+source $stdenv/setup
+source $makeWrapper
 
 export MONO_GAC_PREFIX=$monodoc:$gtksharp
 
diff --git a/pkgs/applications/editors/monodoc/builder.sh b/pkgs/applications/editors/monodoc/builder.sh
index cce1c983f838..ee80be9d95c4 100644
--- a/pkgs/applications/editors/monodoc/builder.sh
+++ b/pkgs/applications/editors/monodoc/builder.sh
@@ -1,5 +1,5 @@
-. $stdenv/setup
-. $makeWrapper
+source $stdenv/setup
+source $makeWrapper
 
 postInstall=postInstall
 postInstall() {
diff --git a/pkgs/applications/editors/vim/builder.sh b/pkgs/applications/editors/vim/builder.sh
index d38440648e99..0b61d421abc4 100644
--- a/pkgs/applications/editors/vim/builder.sh
+++ b/pkgs/applications/editors/vim/builder.sh
@@ -1,3 +1,3 @@
-. $stdenv/setup
+source $stdenv/setup
 
 genericBuild
diff --git a/pkgs/applications/graphics/batik/builder.sh b/pkgs/applications/graphics/batik/builder.sh
index 06af1559b022..c6cf64bf3700 100755
--- a/pkgs/applications/graphics/batik/builder.sh
+++ b/pkgs/applications/graphics/batik/builder.sh
@@ -1,6 +1,6 @@
 set -e
 
-. $stdenv/setup
+source $stdenv/setup
 
 unzip $src
 mkdir $out
diff --git a/pkgs/applications/graphics/f-spot/builder.sh b/pkgs/applications/graphics/f-spot/builder.sh
index bf7d9244ce9d..2e3aaf894bf0 100644
--- a/pkgs/applications/graphics/f-spot/builder.sh
+++ b/pkgs/applications/graphics/f-spot/builder.sh
@@ -1,5 +1,5 @@
-. $stdenv/setup
-. $makeWrapper
+source $stdenv/setup
+source $makeWrapper
 
 postInstall=postInstall
 postInstall() {
diff --git a/pkgs/applications/misc/acrobat-reader/builder.sh b/pkgs/applications/misc/acrobat-reader/builder.sh
index 34b547e93aac..27b4d39faf19 100644
--- a/pkgs/applications/misc/acrobat-reader/builder.sh
+++ b/pkgs/applications/misc/acrobat-reader/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 echo "unpacking $src..."
 tar xvfz $src
diff --git a/pkgs/applications/misc/hello/ex-1/builder.sh b/pkgs/applications/misc/hello/ex-1/builder.sh
index befc4b174689..08bba946cce2 100644
--- a/pkgs/applications/misc/hello/ex-1/builder.sh
+++ b/pkgs/applications/misc/hello/ex-1/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 PATH=$perl/bin:$PATH
 
diff --git a/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh b/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh
index 4cfe7be65a92..6abbf1a760ba 100644
--- a/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh
+++ b/pkgs/applications/networking/browsers/firefox-wrapper/builder.sh
@@ -1,5 +1,5 @@
-. $stdenv/setup
-. $makeWrapper
+source $stdenv/setup
+source $makeWrapper
 
 makeWrapper "$firefox/bin/firefox" "$out/bin/firefox" \
     --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
diff --git a/pkgs/applications/networking/browsers/firefox/builder.sh b/pkgs/applications/networking/browsers/firefox/builder.sh
index 9c43004025c7..b2f2136272dc 100644
--- a/pkgs/applications/networking/browsers/firefox/builder.sh
+++ b/pkgs/applications/networking/browsers/firefox/builder.sh
@@ -1,9 +1,9 @@
-. $stdenv/setup
+source $stdenv/setup
 
 preConfigure=preConfigure
 preConfigure() {
     cat > .mozconfig <<EOF
-. \$topsrcdir/browser/config/mozconfig
+source \$topsrcdir/browser/config/mozconfig
 ac_add_options --prefix=$out
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh
index 085053331c76..8b68b8182e25 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 dontBuild=1
 dontMakeInstall=1
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh
index d9b895dead24..4c67dcd4f8fe 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 # The Firefox pkgconfig files are buggy; they are called firefox-*.pc,
 # but they refer to mozilla-*.pc.  Also, mplayerplug-in requires
diff --git a/pkgs/applications/networking/browsers/mozilla/builder.sh b/pkgs/applications/networking/browsers/mozilla/builder.sh
index 0b5b11f0028a..06652b081fad 100644
--- a/pkgs/applications/networking/browsers/mozilla/builder.sh
+++ b/pkgs/applications/networking/browsers/mozilla/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 preConfigure=preConfigure
 preConfigure() {
diff --git a/pkgs/applications/networking/browsers/w3m/builder.sh b/pkgs/applications/networking/browsers/w3m/builder.sh
index 1ebaa047ba2a..5a28940f4a66 100644
--- a/pkgs/applications/networking/browsers/w3m/builder.sh
+++ b/pkgs/applications/networking/browsers/w3m/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 configureFlags="--with-ssl=$openssl --with-gc=$boehmgc $configureFlags"
 
diff --git a/pkgs/applications/networking/instant-messengers/gaim/builder.sh b/pkgs/applications/networking/instant-messengers/gaim/builder.sh
index ceff6f1b0ea3..4ad985ce8004 100644
--- a/pkgs/applications/networking/instant-messengers/gaim/builder.sh
+++ b/pkgs/applications/networking/instant-messengers/gaim/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 configureFlags="\
   --with-nspr-includes=$nss/include/nspr \
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/builder.sh b/pkgs/applications/networking/mailreaders/thunderbird/builder.sh
index b1df6d868b32..ecd2cbb91bc2 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/builder.sh
+++ b/pkgs/applications/networking/mailreaders/thunderbird/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 preConfigure() {
     cat mail/config/mozconfig > .mozconfig
diff --git a/pkgs/applications/version-management/subversion-1.1.x/builder.sh b/pkgs/applications/version-management/subversion-1.1.x/builder.sh
index 09e6654faa6a..ed6228487949 100644
--- a/pkgs/applications/version-management/subversion-1.1.x/builder.sh
+++ b/pkgs/applications/version-management/subversion-1.1.x/builder.sh
@@ -1,5 +1,5 @@
 buildInputs="$openssl $zlib $db4 $httpd $swig $python $jdk $expat $patch"
-. $stdenv/setup
+source $stdenv/setup
 
 configureFlags="--without-gdbm --disable-static"
 
diff --git a/pkgs/applications/version-management/subversion-1.2.x/builder.sh b/pkgs/applications/version-management/subversion-1.2.x/builder.sh
index 59afaecc35a7..ae36439da8fc 100644
--- a/pkgs/applications/version-management/subversion-1.2.x/builder.sh
+++ b/pkgs/applications/version-management/subversion-1.2.x/builder.sh
@@ -1,5 +1,5 @@
 buildInputs="$openssl $zlib $db4 $httpd $swig $python $jdk $expat $patch"
-. $stdenv/setup
+source $stdenv/setup
 
 configureFlags="--without-gdbm --disable-static"
 
diff --git a/pkgs/applications/video/MPlayer/builder.sh b/pkgs/applications/video/MPlayer/builder.sh
index 2a4a7506ae38..79c0a0ba6e0d 100644
--- a/pkgs/applications/video/MPlayer/builder.sh
+++ b/pkgs/applications/video/MPlayer/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 # !!! Remove eventually.
 export _POSIX2_VERSION=199209
diff --git a/pkgs/applications/video/MPlayer/win32codecs/builder.sh b/pkgs/applications/video/MPlayer/win32codecs/builder.sh
index 4d9ce0b07894..b8dfd5ce6b8e 100644
--- a/pkgs/applications/video/MPlayer/win32codecs/builder.sh
+++ b/pkgs/applications/video/MPlayer/win32codecs/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 buildPhase=true
 
diff --git a/pkgs/applications/video/RealPlayer/builder.sh b/pkgs/applications/video/RealPlayer/builder.sh
index d27a92af9e88..c8796b4d9390 100644
--- a/pkgs/applications/video/RealPlayer/builder.sh
+++ b/pkgs/applications/video/RealPlayer/builder.sh
@@ -1,5 +1,5 @@
-. $stdenv/setup
-. $makeWrapper
+source $stdenv/setup
+source $makeWrapper
 
 ensureDir $out/real
 
diff --git a/pkgs/applications/video/mythtv/builder.sh b/pkgs/applications/video/mythtv/builder.sh
index fc92cab91ab1..0e7bf604f7d6 100644
--- a/pkgs/applications/video/mythtv/builder.sh
+++ b/pkgs/applications/video/mythtv/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 
 buildPhase=myBuilder
diff --git a/pkgs/applications/video/zapping/builder.sh b/pkgs/applications/video/zapping/builder.sh
index 3114f86eda34..51387e5b8a71 100644
--- a/pkgs/applications/video/zapping/builder.sh
+++ b/pkgs/applications/video/zapping/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 # !!! hack
 NIX_LDFLAGS="$NIX_LDFLAGS -rpath $libXext/lib"
diff --git a/pkgs/build-support/fetchfile/builder.sh b/pkgs/build-support/fetchfile/builder.sh
index 223b977bf14f..b38e1927809a 100644
--- a/pkgs/build-support/fetchfile/builder.sh
+++ b/pkgs/build-support/fetchfile/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 echo "copying $url into $out..."
 
diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh
index 25a3c7568926..d3099e7ccccd 100644
--- a/pkgs/build-support/fetchsvn/builder.sh
+++ b/pkgs/build-support/fetchsvn/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 header "exporting $url (r$rev) into $out"
 
diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh
index afa381fabc6c..a74047c48e97 100644
--- a/pkgs/build-support/fetchurl/builder.sh
+++ b/pkgs/build-support/fetchurl/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 header "downloading $out from $url"
 
diff --git a/pkgs/build-support/gcc-cross-wrapper/builder.sh b/pkgs/build-support/gcc-cross-wrapper/builder.sh
index 48a29694f672..18fdb511d681 100644
--- a/pkgs/build-support/gcc-cross-wrapper/builder.sh
+++ b/pkgs/build-support/gcc-cross-wrapper/builder.sh
@@ -1,5 +1,5 @@
-. $stdenv/setup
-. $substitute
+source $stdenv/setup
+source $substitute
 
 
 # Force gcc to use ld-wrapper.sh when calling ld.
diff --git a/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh
index 7de57afc3f81..d514b57e28a0 100644
--- a/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh
+++ b/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh
@@ -1,14 +1,14 @@
 #! @shell@ -e
 
 if test -n "$NIX_GCC_WRAPPER_START_HOOK"; then
-    . "$NIX_GCC_WRAPPER_START_HOOK"
+    source "$NIX_GCC_WRAPPER_START_HOOK"
 fi
 
 if test -z "$NIX_GLIBC_FLAGS_SET"; then
-    . @out@/nix-support/add-flags
+    source @out@/nix-support/add-flags
 fi
 
-. @out@/nix-support/utils
+source @out@/nix-support/utils
 
 
 # Figure out if linker flags should be passed.  GCC prints annoying
@@ -109,7 +109,7 @@ if test "$NIX_DEBUG" = "1"; then
 fi
 
 if test -n "$NIX_GCC_WRAPPER_EXEC_HOOK"; then
-    . "$NIX_GCC_WRAPPER_EXEC_HOOK"
+    source "$NIX_GCC_WRAPPER_EXEC_HOOK"
 fi
 
 
diff --git a/pkgs/build-support/gcc-cross-wrapper/ld-wrapper.sh b/pkgs/build-support/gcc-cross-wrapper/ld-wrapper.sh
index fbf7186ad276..cc1b125804a4 100644
--- a/pkgs/build-support/gcc-cross-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/gcc-cross-wrapper/ld-wrapper.sh
@@ -1,14 +1,14 @@
 #! @shell@ -e
 
 if test -n "$NIX_LD_WRAPPER_START_HOOK"; then
-    . "$NIX_LD_WRAPPER_START_HOOK"
+    source "$NIX_LD_WRAPPER_START_HOOK"
 fi
 
 if test -z "$NIX_GLIBC_FLAGS_SET"; then
-    . @out@/nix-support/add-flags
+    source @out@/nix-support/add-flags
 fi
 
-. @out@/nix-support/utils
+source @out@/nix-support/utils
 
 
 # Optionally filter out paths not refering to the store.
@@ -139,7 +139,7 @@ if test "$NIX_DEBUG" = "1"; then
 fi
 
 if test -n "$NIX_LD_WRAPPER_EXEC_HOOK"; then
-    . "$NIX_LD_WRAPPER_EXEC_HOOK"
+    source "$NIX_LD_WRAPPER_EXEC_HOOK"
 fi
 
 exec @ld@ ${extraBefore[@]} "${params[@]}" ${extra[@]}
diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh
index cf3953e2820b..e8dd5fa277f9 100644
--- a/pkgs/build-support/gcc-wrapper/builder.sh
+++ b/pkgs/build-support/gcc-wrapper/builder.sh
@@ -1,5 +1,5 @@
-. $stdenv/setup
-. $substitute
+source $stdenv/setup
+source $substitute
 
 
 # Force gcc to use ld-wrapper.sh when calling ld.
diff --git a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
index 7de57afc3f81..d514b57e28a0 100644
--- a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
+++ b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh
@@ -1,14 +1,14 @@
 #! @shell@ -e
 
 if test -n "$NIX_GCC_WRAPPER_START_HOOK"; then
-    . "$NIX_GCC_WRAPPER_START_HOOK"
+    source "$NIX_GCC_WRAPPER_START_HOOK"
 fi
 
 if test -z "$NIX_GLIBC_FLAGS_SET"; then
-    . @out@/nix-support/add-flags
+    source @out@/nix-support/add-flags
 fi
 
-. @out@/nix-support/utils
+source @out@/nix-support/utils
 
 
 # Figure out if linker flags should be passed.  GCC prints annoying
@@ -109,7 +109,7 @@ if test "$NIX_DEBUG" = "1"; then
 fi
 
 if test -n "$NIX_GCC_WRAPPER_EXEC_HOOK"; then
-    . "$NIX_GCC_WRAPPER_EXEC_HOOK"
+    source "$NIX_GCC_WRAPPER_EXEC_HOOK"
 fi
 
 
diff --git a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
index fbf7186ad276..cc1b125804a4 100644
--- a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh
@@ -1,14 +1,14 @@
 #! @shell@ -e
 
 if test -n "$NIX_LD_WRAPPER_START_HOOK"; then
-    . "$NIX_LD_WRAPPER_START_HOOK"
+    source "$NIX_LD_WRAPPER_START_HOOK"
 fi
 
 if test -z "$NIX_GLIBC_FLAGS_SET"; then
-    . @out@/nix-support/add-flags
+    source @out@/nix-support/add-flags
 fi
 
-. @out@/nix-support/utils
+source @out@/nix-support/utils
 
 
 # Optionally filter out paths not refering to the store.
@@ -139,7 +139,7 @@ if test "$NIX_DEBUG" = "1"; then
 fi
 
 if test -n "$NIX_LD_WRAPPER_EXEC_HOOK"; then
-    . "$NIX_LD_WRAPPER_EXEC_HOOK"
+    source "$NIX_LD_WRAPPER_EXEC_HOOK"
 fi
 
 exec @ld@ ${extraBefore[@]} "${params[@]}" ${extra[@]}
diff --git a/pkgs/build-support/make-symlinks/builder.sh b/pkgs/build-support/make-symlinks/builder.sh
index b79e2039bfec..70f1d2ca1b25 100644
--- a/pkgs/build-support/make-symlinks/builder.sh
+++ b/pkgs/build-support/make-symlinks/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 mkdir $out
 for file in $files
diff --git a/pkgs/build-support/mono-dll-fixer/builder.sh b/pkgs/build-support/mono-dll-fixer/builder.sh
index 277a108ee7da..6b1e9e47549d 100644
--- a/pkgs/build-support/mono-dll-fixer/builder.sh
+++ b/pkgs/build-support/mono-dll-fixer/builder.sh
@@ -1,5 +1,5 @@
-. $stdenv/setup
-. $substituter
+source $stdenv/setup
+source $substituter
 
 substitute $dllFixer $out --subst-var-by perl $perl/bin/perl
 chmod +x $out
diff --git a/pkgs/data/sgml+xml/schemas/docbook-ng/builder.sh b/pkgs/data/sgml+xml/schemas/docbook-ng/builder.sh
index 742cbf5faa6d..fcf6aa26ed1a 100644
--- a/pkgs/data/sgml+xml/schemas/docbook-ng/builder.sh
+++ b/pkgs/data/sgml+xml/schemas/docbook-ng/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 mkdir -p $out/xml/rng/docbook
 cd $out/xml/rng/docbook
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/builder.sh b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/builder.sh
index 3d75dccba37f..752c15450061 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/builder.sh
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.2/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 mkdir -p $out/xml/dtd/docbook
 cd $out/xml/dtd/docbook
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/builder.sh b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/builder.sh
index 3d75dccba37f..752c15450061 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/builder.sh
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-4.3/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 mkdir -p $out/xml/dtd/docbook
 cd $out/xml/dtd/docbook
diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh
index c806d1d33fe9..70fd729297c0 100644
--- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh
+++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 mkdir -p $out/xml/dtd/docbook-ebnf
 cd $out/xml/dtd/docbook-ebnf
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook/builder.sh b/pkgs/data/sgml+xml/stylesheets/xslt/docbook/builder.sh
index 156251fe5db7..01775585abaf 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook/builder.sh
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 mkdir $out
 cd $out
diff --git a/pkgs/development/compilers/blackdown/builder.sh b/pkgs/development/compilers/blackdown/builder.sh
index e44a7d4af942..5969318440f1 100755
--- a/pkgs/development/compilers/blackdown/builder.sh
+++ b/pkgs/development/compilers/blackdown/builder.sh
@@ -1,6 +1,6 @@
 set -e
 
-. $stdenv/setup
+source $stdenv/setup
 
 cp $src .
 bin=`basename $src`
diff --git a/pkgs/development/compilers/gcc-2.95/builder.sh b/pkgs/development/compilers/gcc-2.95/builder.sh
index 817951a37354..1b71df58807a 100644
--- a/pkgs/development/compilers/gcc-2.95/builder.sh
+++ b/pkgs/development/compilers/gcc-2.95/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 
 export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
diff --git a/pkgs/development/compilers/gcc-3.3/builder.sh b/pkgs/development/compilers/gcc-3.3/builder.sh
index 22d1e38707a0..a61ad483dcf6 100644
--- a/pkgs/development/compilers/gcc-3.3/builder.sh
+++ b/pkgs/development/compilers/gcc-3.3/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 
 FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
diff --git a/pkgs/development/compilers/gcc-3.4-arm/builder.sh b/pkgs/development/compilers/gcc-3.4-arm/builder.sh
index f66e7b7ce281..be5e9634f7be 100644
--- a/pkgs/development/compilers/gcc-3.4-arm/builder.sh
+++ b/pkgs/development/compilers/gcc-3.4-arm/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 
 export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
diff --git a/pkgs/development/compilers/gcc-3.4/builder.sh b/pkgs/development/compilers/gcc-3.4/builder.sh
index 60af74ed7654..3dfc5a1132d0 100644
--- a/pkgs/development/compilers/gcc-3.4/builder.sh
+++ b/pkgs/development/compilers/gcc-3.4/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 
 export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
diff --git a/pkgs/development/compilers/gcc-4.0-arm/builder.sh b/pkgs/development/compilers/gcc-4.0-arm/builder.sh
index c89cae9a16c3..922a29a59a0c 100644
--- a/pkgs/development/compilers/gcc-4.0-arm/builder.sh
+++ b/pkgs/development/compilers/gcc-4.0-arm/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 
 export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
diff --git a/pkgs/development/compilers/gcc-4.0/builder.sh b/pkgs/development/compilers/gcc-4.0/builder.sh
index 30498afe241d..7808a2e4a9ef 100644
--- a/pkgs/development/compilers/gcc-4.0/builder.sh
+++ b/pkgs/development/compilers/gcc-4.0/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 
 export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
diff --git a/pkgs/development/compilers/gcc-static-3.4/builder.sh b/pkgs/development/compilers/gcc-static-3.4/builder.sh
index 8021ba092f06..728ddc746079 100644
--- a/pkgs/development/compilers/gcc-static-3.4/builder.sh
+++ b/pkgs/development/compilers/gcc-static-3.4/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 export LDFLAGS="-static"
 
diff --git a/pkgs/development/compilers/gwydion-dylan/binary-builder.sh b/pkgs/development/compilers/gwydion-dylan/binary-builder.sh
index 7956a8a72133..a0e71c02ab93 100644
--- a/pkgs/development/compilers/gwydion-dylan/binary-builder.sh
+++ b/pkgs/development/compilers/gwydion-dylan/binary-builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 set -e
 
diff --git a/pkgs/development/compilers/gwydion-dylan/builder.sh b/pkgs/development/compilers/gwydion-dylan/builder.sh
index 23c63da9198e..ea2e54243990 100644
--- a/pkgs/development/compilers/gwydion-dylan/builder.sh
+++ b/pkgs/development/compilers/gwydion-dylan/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 export DYLANDIR=$dylan
 export DYLANPATH=$dylan/lib/dylan/2.4.0/x86-linux-gcc
diff --git a/pkgs/development/compilers/harp/builder.sh b/pkgs/development/compilers/harp/builder.sh
index 9180d143c6a0..29f8e15377de 100644
--- a/pkgs/development/compilers/harp/builder.sh
+++ b/pkgs/development/compilers/harp/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup 
+source $stdenv/setup 
 
 unzip $src
 
diff --git a/pkgs/development/compilers/helium/builder.sh b/pkgs/development/compilers/helium/builder.sh
index d7946ab8a52d..e740690d9a6c 100644
--- a/pkgs/development/compilers/helium/builder.sh
+++ b/pkgs/development/compilers/helium/builder.sh
@@ -1,5 +1,5 @@
 buildinputs="$ghc"
-. $stdenv/setup || exit 1
+source $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
 cd helium-* || exit 1
diff --git a/pkgs/development/compilers/nasm/builder.sh b/pkgs/development/compilers/nasm/builder.sh
index 39500db9e1f5..4109287448dd 100644
--- a/pkgs/development/compilers/nasm/builder.sh
+++ b/pkgs/development/compilers/nasm/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 mkdir -p $out/bin
 mkdir -p $out/man/man1
diff --git a/pkgs/development/compilers/ocaml/builder.sh b/pkgs/development/compilers/ocaml/builder.sh
index 87d82be9c02d..a1807682d867 100644
--- a/pkgs/development/compilers/ocaml/builder.sh
+++ b/pkgs/development/compilers/ocaml/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 configureFlags="-prefix $out $configureFlags"
 genericBuild
diff --git a/pkgs/development/compilers/strategoxt/builder.sh b/pkgs/development/compilers/strategoxt/builder.sh
index 5d3427b3a77f..da02ebcb5e92 100644
--- a/pkgs/development/compilers/strategoxt/builder.sh
+++ b/pkgs/development/compilers/strategoxt/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 configureFlags="--with-aterm=$aterm --with-sdf=$sdf"
 genericBuild
diff --git a/pkgs/development/compilers/tiger/builder.sh b/pkgs/development/compilers/tiger/builder.sh
index aab09f5e1ee3..c602b5280f60 100644
--- a/pkgs/development/compilers/tiger/builder.sh
+++ b/pkgs/development/compilers/tiger/builder.sh
@@ -1,5 +1,5 @@
 buildinputs="$aterm $sdf $strategoxt"
-. $stdenv/setup || exit 1
+source $stdenv/setup || exit 1
 
 tar zxf $src || exit 1
 cd tiger-* || exit 1
diff --git a/pkgs/development/eclipse/ecj/builder.sh b/pkgs/development/eclipse/ecj/builder.sh
index 1b3d86f44a5a..85982a6bc33d 100644
--- a/pkgs/development/eclipse/ecj/builder.sh
+++ b/pkgs/development/eclipse/ecj/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 unzip $src
 cd jdtcoresrc
diff --git a/pkgs/development/eclipse/jdt-sdk/builder.sh b/pkgs/development/eclipse/jdt-sdk/builder.sh
index 8c0e0ac44eaa..40de662b775f 100755
--- a/pkgs/development/eclipse/jdt-sdk/builder.sh
+++ b/pkgs/development/eclipse/jdt-sdk/builder.sh
@@ -1,6 +1,6 @@
 set -e
 
-. $stdenv/setup
+source $stdenv/setup
 
 unzip $src 
 mkdir $out
diff --git a/pkgs/development/interpreters/clisp/builder.sh b/pkgs/development/interpreters/clisp/builder.sh
index 5ba9dc5f95bb..1c6c5a6bb3d5 100644
--- a/pkgs/development/interpreters/clisp/builder.sh
+++ b/pkgs/development/interpreters/clisp/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup || exit 1
+source $stdenv/setup || exit 1
 
 set -e
 
diff --git a/pkgs/development/interpreters/jre/builder.sh b/pkgs/development/interpreters/jre/builder.sh
index 98d5156fabe8..8ddd87622653 100644
--- a/pkgs/development/interpreters/jre/builder.sh
+++ b/pkgs/development/interpreters/jre/builder.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-. $stdenv/setup || exit 1
+source $stdenv/setup || exit 1
 
 cp $src $version.bin || exit 1
 chmod u+x $version.bin || exit 1
diff --git a/pkgs/development/interpreters/kaffe/builder.sh b/pkgs/development/interpreters/kaffe/builder.sh
index 1a5e5fa31c1a..823a8ebff0ec 100755
--- a/pkgs/development/interpreters/kaffe/builder.sh
+++ b/pkgs/development/interpreters/kaffe/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup || exit 1
+source $stdenv/setup || exit 1
 
 configureFlags="--with-jikes=$jikes/bin/jikes --enable-pure-java-math"
 genericBuild
diff --git a/pkgs/development/interpreters/perl/builder.sh b/pkgs/development/interpreters/perl/builder.sh
index a4756197b798..e39ae47e573a 100644
--- a/pkgs/development/interpreters/perl/builder.sh
+++ b/pkgs/development/interpreters/perl/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then
     GLIBC=$(cat $NIX_GCC/nix-support/orig-glibc)
diff --git a/pkgs/development/interpreters/php/builder.sh b/pkgs/development/interpreters/php/builder.sh
index 73051ee0e71d..3fd315a533d2 100644
--- a/pkgs/development/interpreters/php/builder.sh
+++ b/pkgs/development/interpreters/php/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 alias lex=flex
 
diff --git a/pkgs/development/interpreters/sys-perl/builder.sh b/pkgs/development/interpreters/sys-perl/builder.sh
index 33c54134f3b9..6b3560cb289d 100644
--- a/pkgs/development/interpreters/sys-perl/builder.sh
+++ b/pkgs/development/interpreters/sys-perl/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 mkdir $out
 mkdir $out/bin
 ln -s /usr/bin/perl $out/bin
diff --git a/pkgs/development/libraries/audiofile/builder.sh b/pkgs/development/libraries/audiofile/builder.sh
index 43db47a8b26c..b3b3f83bb424 100644
--- a/pkgs/development/libraries/audiofile/builder.sh
+++ b/pkgs/development/libraries/audiofile/builder.sh
@@ -1,5 +1,5 @@
 buildinputs=""
-. $stdenv/setup || exit 1
+source $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
 cd audiofile-* || exit 1
diff --git a/pkgs/development/libraries/chmlib/builder.sh b/pkgs/development/libraries/chmlib/builder.sh
index 2fd6d7a830cb..7ac8930fb61a 100644
--- a/pkgs/development/libraries/chmlib/builder.sh
+++ b/pkgs/development/libraries/chmlib/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 unpackCmd="tar xvfj $src"
 
diff --git a/pkgs/development/libraries/db4/builder.sh b/pkgs/development/libraries/db4/builder.sh
index 8c86e426ba5e..d71bd8067436 100644
--- a/pkgs/development/libraries/db4/builder.sh
+++ b/pkgs/development/libraries/db4/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 preConfigure() {
     cd build_unix
diff --git a/pkgs/development/libraries/fontconfig/builder.sh b/pkgs/development/libraries/fontconfig/builder.sh
index 48c1d5e23d3c..5049df50318b 100644
--- a/pkgs/development/libraries/fontconfig/builder.sh
+++ b/pkgs/development/libraries/fontconfig/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 configureFlags="--with-confdir=$out/etc/fonts"
 
diff --git a/pkgs/development/libraries/glibc/builder.sh b/pkgs/development/libraries/glibc/builder.sh
index 55c540e683b1..54b99df7c423 100644
--- a/pkgs/development/libraries/glibc/builder.sh
+++ b/pkgs/development/libraries/glibc/builder.sh
@@ -2,8 +2,8 @@
 export NIX_NO_SELF_RPATH=1
 export NIX_DONT_SET_RPATH=1
 
-. $stdenv/setup
-. $substitute
+source $stdenv/setup
+source $substitute
 
 glibc=`cat $NIX_GCC/nix-support/orig-glibc`
 echo $glibc
diff --git a/pkgs/development/libraries/gnome/gnome-vfs/builder.sh b/pkgs/development/libraries/gnome/gnome-vfs/builder.sh
index 130c295801a4..3c59b545b408 100644
--- a/pkgs/development/libraries/gnome/gnome-vfs/builder.sh
+++ b/pkgs/development/libraries/gnome/gnome-vfs/builder.sh
@@ -5,6 +5,6 @@ addBzip2() {
     buildInputs="$(dirname $(dirname $bzip2)) $buildInputs"
 }
 
-. $stdenv/setup
+source $stdenv/setup
 
 genericBuild
\ No newline at end of file
diff --git a/pkgs/development/libraries/gnome/scrollkeeper/builder.sh b/pkgs/development/libraries/gnome/scrollkeeper/builder.sh
index c2c8fb9fe316..d1d90a2dfdc7 100644
--- a/pkgs/development/libraries/gnome/scrollkeeper/builder.sh
+++ b/pkgs/development/libraries/gnome/scrollkeeper/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 configureFlags="--with-xml-catalog=$docbook_xml_dtd_42/xml/dtd/docbook/docbook.cat"
 
diff --git a/pkgs/development/libraries/gtk-libs-1.x/gtk+/builder.sh b/pkgs/development/libraries/gtk-libs-1.x/gtk+/builder.sh
index 9c1af29b65e5..da9b8dc6128f 100644
--- a/pkgs/development/libraries/gtk-libs-1.x/gtk+/builder.sh
+++ b/pkgs/development/libraries/gtk-libs-1.x/gtk+/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 genericBuild
 
 if test -n "$_propagatedBuildInputs"; then
diff --git a/pkgs/development/libraries/gtk-sharp-1/builder.sh b/pkgs/development/libraries/gtk-sharp-1/builder.sh
index f6911c63ac92..4b8f757540b5 100644
--- a/pkgs/development/libraries/gtk-sharp-1/builder.sh
+++ b/pkgs/development/libraries/gtk-sharp-1/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 genericBuild
 
diff --git a/pkgs/development/libraries/gtk-sharp-2/builder.sh b/pkgs/development/libraries/gtk-sharp-2/builder.sh
index f6911c63ac92..4b8f757540b5 100644
--- a/pkgs/development/libraries/gtk-sharp-2/builder.sh
+++ b/pkgs/development/libraries/gtk-sharp-2/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 genericBuild
 
diff --git a/pkgs/development/libraries/gtkmozembed-sharp/builder.sh b/pkgs/development/libraries/gtkmozembed-sharp/builder.sh
index f6911c63ac92..4b8f757540b5 100644
--- a/pkgs/development/libraries/gtkmozembed-sharp/builder.sh
+++ b/pkgs/development/libraries/gtkmozembed-sharp/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 genericBuild
 
diff --git a/pkgs/development/libraries/gtksourceview-sharp/builder.sh b/pkgs/development/libraries/gtksourceview-sharp/builder.sh
index f6911c63ac92..4b8f757540b5 100644
--- a/pkgs/development/libraries/gtksourceview-sharp/builder.sh
+++ b/pkgs/development/libraries/gtksourceview-sharp/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 genericBuild
 
diff --git a/pkgs/development/libraries/java/cup/builder.sh b/pkgs/development/libraries/java/cup/builder.sh
index ecd33aa1363c..3cd75dd396c0 100755
--- a/pkgs/development/libraries/java/cup/builder.sh
+++ b/pkgs/development/libraries/java/cup/builder.sh
@@ -1,5 +1,5 @@
 set -e
-. $stdenv/setup
+source $stdenv/setup
 
 tar zxvf $src
 
diff --git a/pkgs/development/libraries/java/httpunit/builder.sh b/pkgs/development/libraries/java/httpunit/builder.sh
index 53bf996caa39..273850082958 100755
--- a/pkgs/development/libraries/java/httpunit/builder.sh
+++ b/pkgs/development/libraries/java/httpunit/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 $unzip/bin/unzip $src
 mkdir $out
diff --git a/pkgs/development/libraries/java/jakarta-bcel/builder.sh b/pkgs/development/libraries/java/jakarta-bcel/builder.sh
index f6bd3dd9ec7b..9ead7cfebde7 100755
--- a/pkgs/development/libraries/java/jakarta-bcel/builder.sh
+++ b/pkgs/development/libraries/java/jakarta-bcel/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 tar zxvf $src
 cd bcel-5.1
diff --git a/pkgs/development/libraries/java/jakarta-commons/file-upload/builder.sh b/pkgs/development/libraries/java/jakarta-commons/file-upload/builder.sh
index d1a93c0fdf4d..d95feb5eeb44 100755
--- a/pkgs/development/libraries/java/jakarta-commons/file-upload/builder.sh
+++ b/pkgs/development/libraries/java/jakarta-commons/file-upload/builder.sh
@@ -1,5 +1,5 @@
 set -e
-. $stdenv/setup
+source $stdenv/setup
 
 tar zxvf $src
 mkdir -p $out
diff --git a/pkgs/development/libraries/java/jakarta-regexp/java-bin-builder.sh b/pkgs/development/libraries/java/jakarta-regexp/java-bin-builder.sh
index 1d0a5ab22fb0..be2c35778012 100755
--- a/pkgs/development/libraries/java/jakarta-regexp/java-bin-builder.sh
+++ b/pkgs/development/libraries/java/jakarta-regexp/java-bin-builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 tar zxvf $src
 cd jakarta-regexp-1.3
diff --git a/pkgs/development/libraries/java/javasvn/builder.sh b/pkgs/development/libraries/java/javasvn/builder.sh
index e814bbd09ddc..5eaed4c88425 100755
--- a/pkgs/development/libraries/java/javasvn/builder.sh
+++ b/pkgs/development/libraries/java/javasvn/builder.sh
@@ -1,5 +1,5 @@
 set -e
-. $stdenv/setup
+source $stdenv/setup
 
 $unzip/bin/unzip $src
 mkdir -p $out
diff --git a/pkgs/development/libraries/java/jdom/builder.sh b/pkgs/development/libraries/java/jdom/builder.sh
index d1a93c0fdf4d..d95feb5eeb44 100755
--- a/pkgs/development/libraries/java/jdom/builder.sh
+++ b/pkgs/development/libraries/java/jdom/builder.sh
@@ -1,5 +1,5 @@
 set -e
-. $stdenv/setup
+source $stdenv/setup
 
 tar zxvf $src
 mkdir -p $out
diff --git a/pkgs/development/libraries/java/jflex/builder.sh b/pkgs/development/libraries/java/jflex/builder.sh
index d1a93c0fdf4d..d95feb5eeb44 100755
--- a/pkgs/development/libraries/java/jflex/builder.sh
+++ b/pkgs/development/libraries/java/jflex/builder.sh
@@ -1,5 +1,5 @@
 set -e
-. $stdenv/setup
+source $stdenv/setup
 
 tar zxvf $src
 mkdir -p $out
diff --git a/pkgs/development/libraries/java/junit/builder.sh b/pkgs/development/libraries/java/junit/builder.sh
index e8105eca4e32..a76360ead1e8 100755
--- a/pkgs/development/libraries/java/junit/builder.sh
+++ b/pkgs/development/libraries/java/junit/builder.sh
@@ -1,5 +1,5 @@
 set -e
-. $stdenv/setup
+source $stdenv/setup
 
 $unzip/bin/unzip $src
 mkdir -p $out
diff --git a/pkgs/development/libraries/java/lucene/builder.sh b/pkgs/development/libraries/java/lucene/builder.sh
index d1a93c0fdf4d..d95feb5eeb44 100755
--- a/pkgs/development/libraries/java/lucene/builder.sh
+++ b/pkgs/development/libraries/java/lucene/builder.sh
@@ -1,5 +1,5 @@
 set -e
-. $stdenv/setup
+source $stdenv/setup
 
 tar zxvf $src
 mkdir -p $out
diff --git a/pkgs/development/libraries/java/mockobjects/builder.sh b/pkgs/development/libraries/java/mockobjects/builder.sh
index 358d45d872be..fd5d1a20869c 100755
--- a/pkgs/development/libraries/java/mockobjects/builder.sh
+++ b/pkgs/development/libraries/java/mockobjects/builder.sh
@@ -1,5 +1,5 @@
 set -e
-. $stdenv/setup
+source $stdenv/setup
 
 tar xvf $src
 mkdir -p $out
diff --git a/pkgs/development/libraries/java/saxon/unzip-builder.sh b/pkgs/development/libraries/java/saxon/unzip-builder.sh
index 34df48d74bc6..48b3d4509d03 100755
--- a/pkgs/development/libraries/java/saxon/unzip-builder.sh
+++ b/pkgs/development/libraries/java/saxon/unzip-builder.sh
@@ -1,3 +1,3 @@
-. $stdenv/setup
+source $stdenv/setup
 
 unzip $src -d $out
diff --git a/pkgs/development/libraries/libdvdread/builder.sh b/pkgs/development/libraries/libdvdread/builder.sh
index 9173ce1b205e..9b655cc0319a 100644
--- a/pkgs/development/libraries/libdvdread/builder.sh
+++ b/pkgs/development/libraries/libdvdread/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 configureFlags="--with-libdvdcss=$libdvdcss"
 
diff --git a/pkgs/development/libraries/libjpeg/builder.sh b/pkgs/development/libraries/libjpeg/builder.sh
index 4dae40be2f6f..f166dc66e26b 100644
--- a/pkgs/development/libraries/libjpeg/builder.sh
+++ b/pkgs/development/libraries/libjpeg/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 configureFlags="--enable-shared"
 
diff --git a/pkgs/development/libraries/libtiff/builder.sh b/pkgs/development/libraries/libtiff/builder.sh
index b627e0ecaabb..dd1bdebd39c1 100644
--- a/pkgs/development/libraries/libtiff/builder.sh
+++ b/pkgs/development/libraries/libtiff/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 configureFlags="--with-DIR_MAN=$out/man --with-ZIP --with-JPEG"
 
diff --git a/pkgs/development/libraries/libxml2/builder.sh b/pkgs/development/libraries/libxml2/builder.sh
index f78324024953..fdd5dac99f0c 100755
--- a/pkgs/development/libraries/libxml2/builder.sh
+++ b/pkgs/development/libraries/libxml2/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 configureFlags=""
 if test "$pythonSupport"; then
diff --git a/pkgs/development/libraries/mesa/builder.sh b/pkgs/development/libraries/mesa/builder.sh
index 5fbad40011f7..978bd0f18a08 100644
--- a/pkgs/development/libraries/mesa/builder.sh
+++ b/pkgs/development/libraries/mesa/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 makeFlags="linux-x86"
 
diff --git a/pkgs/development/libraries/nss/builder.sh b/pkgs/development/libraries/nss/builder.sh
index 9b9fa0c304ff..ae9db584079a 100644
--- a/pkgs/development/libraries/nss/builder.sh
+++ b/pkgs/development/libraries/nss/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 # This must be the ugliest builder in the Nix Packages
 
diff --git a/pkgs/development/libraries/openssl-0.9.8/builder.sh b/pkgs/development/libraries/openssl-0.9.8/builder.sh
index 0ad465c87715..1004d279a511 100644
--- a/pkgs/development/libraries/openssl-0.9.8/builder.sh
+++ b/pkgs/development/libraries/openssl-0.9.8/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 configureScript=./config
 configureFlags=shared
diff --git a/pkgs/development/libraries/openssl/builder.sh b/pkgs/development/libraries/openssl/builder.sh
index 0ad465c87715..1004d279a511 100644
--- a/pkgs/development/libraries/openssl/builder.sh
+++ b/pkgs/development/libraries/openssl/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 configureScript=./config
 configureFlags=shared
diff --git a/pkgs/development/libraries/popt/builder.sh b/pkgs/development/libraries/popt/builder.sh
index 851e010f0382..67696b464675 100644
--- a/pkgs/development/libraries/popt/builder.sh
+++ b/pkgs/development/libraries/popt/builder.sh
@@ -1,5 +1,5 @@
 buildinputs="$gettext"
-. $stdenv/setup || exit 1
+source $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
 cd popt-* || exit 1
diff --git a/pkgs/development/libraries/qt-3/builder.sh b/pkgs/development/libraries/qt-3/builder.sh
index 0af2669ba9b0..f18c0f351b5d 100644
--- a/pkgs/development/libraries/qt-3/builder.sh
+++ b/pkgs/development/libraries/qt-3/builder.sh
@@ -1,5 +1,5 @@
-. $stdenv/setup
-. $substitute
+source $stdenv/setup
+source $substitute
 
 ensureDir $out/nix-support
 substitute "$hook" "$out/nix-support/setup-hook" --subst-var out
diff --git a/pkgs/development/libraries/readline/builder.sh b/pkgs/development/libraries/readline/builder.sh
index 6941aaf19c12..95a72f80b356 100644
--- a/pkgs/development/libraries/readline/builder.sh
+++ b/pkgs/development/libraries/readline/builder.sh
@@ -1,6 +1,6 @@
 set -x
 
-. $stdenv/setup
+source $stdenv/setup
 
 tar xvfz $src
 cd readline-*
diff --git a/pkgs/development/libraries/xine-lib/builder.sh b/pkgs/development/libraries/xine-lib/builder.sh
index 484014b3cb4b..4e39b46ba66c 100644
--- a/pkgs/development/libraries/xine-lib/builder.sh
+++ b/pkgs/development/libraries/xine-lib/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 if test -n "$libdvdcss"; then
     # Ugly hack to force libdvdcss to be present (so the user doesn't
diff --git a/pkgs/development/libraries/xlibs/xlibs/builder.sh b/pkgs/development/libraries/xlibs/xlibs/builder.sh
index bfa2c056f4e8..7e40acf9198e 100644
--- a/pkgs/development/libraries/xlibs/xlibs/builder.sh
+++ b/pkgs/development/libraries/xlibs/xlibs/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 dontBuild=1
 dontMakeInstall=1
 nop() {
diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh
index 3a61ba7f67d3..11fb6df81071 100644
--- a/pkgs/development/perl-modules/generic/builder.sh
+++ b/pkgs/development/perl-modules/generic/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 PERL5LIB="$PERL5LIB${PERL5LIB:+:}$out/lib/site_perl"
 
@@ -31,11 +31,11 @@ preConfigure() {
 }
 
 if test -n "$perlPreHook"; then
-    . $perlPreHook
+    source $perlPreHook
 fi
 
 genericBuild
 
 if test -n "$perlPostHook"; then
-    . $perlPostHook
-fi
\ No newline at end of file
+    source $perlPostHook
+fi
diff --git a/pkgs/development/python-modules/wxPython-2.5/builder.sh b/pkgs/development/python-modules/wxPython-2.5/builder.sh
index 6bb06d117515..abfde19a8467 100644
--- a/pkgs/development/python-modules/wxPython-2.5/builder.sh
+++ b/pkgs/development/python-modules/wxPython-2.5/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 flags="WXPORT=gtk2 BUILD_GLCANVAS=0 BUILD_OGL=0"
 
diff --git a/pkgs/development/python-modules/wxPython/builder.sh b/pkgs/development/python-modules/wxPython/builder.sh
index 724ddd2e2390..280f01e26341 100644
--- a/pkgs/development/python-modules/wxPython/builder.sh
+++ b/pkgs/development/python-modules/wxPython/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 flags="WXPORT=gtk2 BUILD_GLCANVAS=0 BUILD_OGL=0"
 
diff --git a/pkgs/development/tools/build-managers/apache-ant/builder.sh b/pkgs/development/tools/build-managers/apache-ant/builder.sh
index f6fba7275d3d..0728ecb6dac7 100644
--- a/pkgs/development/tools/build-managers/apache-ant/builder.sh
+++ b/pkgs/development/tools/build-managers/apache-ant/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup || exit 1
+source $stdenv/setup || exit 1
 
 mkdir -p $out/bin || exit 1
 
diff --git a/pkgs/development/tools/build-managers/apache-ant/core-builder.sh b/pkgs/development/tools/build-managers/apache-ant/core-builder.sh
index 612a11202d53..fad5e047f94c 100644
--- a/pkgs/development/tools/build-managers/apache-ant/core-builder.sh
+++ b/pkgs/development/tools/build-managers/apache-ant/core-builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup || exit 1
+source $stdenv/setup || exit 1
 
 # unpack the binary distribution
 tar jxf $src || exit 1
diff --git a/pkgs/development/tools/documentation/xdoc/builder.sh b/pkgs/development/tools/documentation/xdoc/builder.sh
index 85855d6d2b84..4bc414ff7bfe 100644
--- a/pkgs/development/tools/documentation/xdoc/builder.sh
+++ b/pkgs/development/tools/documentation/xdoc/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 configureFlags="--with-aterm=$aterm --with-sglr=$sglr --with-pgen=$pgen
  --with-pt-support=$ptsupport --with-asf-library=$asflibrary --with-strategoxt=$strategoxt --with-graphviz=$graphviz --with-svn=$subversion"
diff --git a/pkgs/development/tools/java/jclasslib/builder.sh b/pkgs/development/tools/java/jclasslib/builder.sh
index 2c9be51476c1..35e94d0fab93 100755
--- a/pkgs/development/tools/java/jclasslib/builder.sh
+++ b/pkgs/development/tools/java/jclasslib/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup || exit 1
+source $stdenv/setup || exit 1
 
 tar zxf $src || exit 1
 cd jclasslib || exit 1
diff --git a/pkgs/development/tools/misc/automake/builder.sh b/pkgs/development/tools/misc/automake/builder.sh
index 5b319dd31587..0f5e955f8806 100644
--- a/pkgs/development/tools/misc/automake/builder.sh
+++ b/pkgs/development/tools/misc/automake/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 
 postInstall() {
diff --git a/pkgs/development/tools/misc/binutils-arm/builder.sh b/pkgs/development/tools/misc/binutils-arm/builder.sh
index ac8b7f13a790..788effe9b240 100644
--- a/pkgs/development/tools/misc/binutils-arm/builder.sh
+++ b/pkgs/development/tools/misc/binutils-arm/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 patchConfigure() {
     # Clear the default library search path.
diff --git a/pkgs/development/tools/misc/binutils/builder.sh b/pkgs/development/tools/misc/binutils/builder.sh
index ac8b7f13a790..788effe9b240 100644
--- a/pkgs/development/tools/misc/binutils/builder.sh
+++ b/pkgs/development/tools/misc/binutils/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 patchConfigure() {
     # Clear the default library search path.
diff --git a/pkgs/development/tools/misc/gperf/builder.sh b/pkgs/development/tools/misc/gperf/builder.sh
index 08e18c2681d4..0ec305713562 100644
--- a/pkgs/development/tools/misc/gperf/builder.sh
+++ b/pkgs/development/tools/misc/gperf/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 tar xvfz $src
 cd gperf-*
diff --git a/pkgs/development/tools/misc/lcov/builder.sh b/pkgs/development/tools/misc/lcov/builder.sh
index 381037ca3049..d8c79e7040b0 100644
--- a/pkgs/development/tools/misc/lcov/builder.sh
+++ b/pkgs/development/tools/misc/lcov/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 installFlags="PREFIX=$out"
 
diff --git a/pkgs/development/tools/misc/pkgconfig/builder.sh b/pkgs/development/tools/misc/pkgconfig/builder.sh
index 39df58f39bf8..6d281da71e4d 100644
--- a/pkgs/development/tools/misc/pkgconfig/builder.sh
+++ b/pkgs/development/tools/misc/pkgconfig/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 postInstall() {
     test -x $out/nix-support || mkdir $out/nix-support
diff --git a/pkgs/development/tools/misc/strace/builder.sh b/pkgs/development/tools/misc/strace/builder.sh
index d38440648e99..0b61d421abc4 100644
--- a/pkgs/development/tools/misc/strace/builder.sh
+++ b/pkgs/development/tools/misc/strace/builder.sh
@@ -1,3 +1,3 @@
-. $stdenv/setup
+source $stdenv/setup
 
 genericBuild
diff --git a/pkgs/development/tools/misc/swig/builder.sh b/pkgs/development/tools/misc/swig/builder.sh
index b4ac1b18a1f5..907b1656c683 100644
--- a/pkgs/development/tools/misc/swig/builder.sh
+++ b/pkgs/development/tools/misc/swig/builder.sh
@@ -1,3 +1,3 @@
 buildInputs="$perl $python $jdk"
-. $stdenv/setup
+source $stdenv/setup
 genericBuild
diff --git a/pkgs/development/tools/parsing/asc-support/builder.sh b/pkgs/development/tools/parsing/asc-support/builder.sh
index 6fdc9d90bdf5..c3167b6c1f35 100644
--- a/pkgs/development/tools/parsing/asc-support/builder.sh
+++ b/pkgs/development/tools/parsing/asc-support/builder.sh
@@ -1,3 +1,3 @@
-. $stdenv/setup
+source $stdenv/setup
 configureFlags="--with-aterm=$aterm --with-toolbuslib=$toolbuslib --with-pt-support=$ptsupport --with-asf-support=$asfsupport"
 genericBuild
\ No newline at end of file
diff --git a/pkgs/development/tools/parsing/asf-support/builder.sh b/pkgs/development/tools/parsing/asf-support/builder.sh
index 8c22ac230ac1..ae812d4aee26 100644
--- a/pkgs/development/tools/parsing/asf-support/builder.sh
+++ b/pkgs/development/tools/parsing/asf-support/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 configureFlags="--with-aterm=$aterm --with-pt-support=$ptsupport"
 genericBuild
 
diff --git a/pkgs/development/tools/parsing/error-support/builder.sh b/pkgs/development/tools/parsing/error-support/builder.sh
index 4f5f8ffcb3da..b0927b28dbfc 100644
--- a/pkgs/development/tools/parsing/error-support/builder.sh
+++ b/pkgs/development/tools/parsing/error-support/builder.sh
@@ -1,3 +1,3 @@
-. $stdenv/setup
+source $stdenv/setup
 configureFlags="--with-aterm=$aterm --with-toolbuslib=$toolbuslib"
 genericBuild
diff --git a/pkgs/development/tools/parsing/flex-iputils/builder.sh b/pkgs/development/tools/parsing/flex-iputils/builder.sh
index 03bddded882f..946301946bac 100644
--- a/pkgs/development/tools/parsing/flex-iputils/builder.sh
+++ b/pkgs/development/tools/parsing/flex-iputils/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 installPhase() {
    make install
diff --git a/pkgs/development/tools/parsing/pgen/builder.sh b/pkgs/development/tools/parsing/pgen/builder.sh
index a0ffad19b0c3..cdb1271466e6 100644
--- a/pkgs/development/tools/parsing/pgen/builder.sh
+++ b/pkgs/development/tools/parsing/pgen/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 configureFlags="--with-aterm=$aterm \
                 --with-toolbuslib=$toolbuslib \
                 --with-pt-support=$ptsupport \
diff --git a/pkgs/development/tools/parsing/pt-support/builder.sh b/pkgs/development/tools/parsing/pt-support/builder.sh
index 4f5f8ffcb3da..b0927b28dbfc 100644
--- a/pkgs/development/tools/parsing/pt-support/builder.sh
+++ b/pkgs/development/tools/parsing/pt-support/builder.sh
@@ -1,3 +1,3 @@
-. $stdenv/setup
+source $stdenv/setup
 configureFlags="--with-aterm=$aterm --with-toolbuslib=$toolbuslib"
 genericBuild
diff --git a/pkgs/development/tools/parsing/sdf-support/builder.sh b/pkgs/development/tools/parsing/sdf-support/builder.sh
index b366ccb79097..356a2b816b08 100644
--- a/pkgs/development/tools/parsing/sdf-support/builder.sh
+++ b/pkgs/development/tools/parsing/sdf-support/builder.sh
@@ -1,3 +1,3 @@
-. $stdenv/setup
+source $stdenv/setup
 configureFlags="--with-aterm=$aterm --with-toolbuslib=$toolbuslib --with-pt-support=$ptsupport"
 genericBuild
diff --git a/pkgs/development/tools/parsing/sdf/builder.sh b/pkgs/development/tools/parsing/sdf/builder.sh
index 0aa0befcb372..083b2be77964 100644
--- a/pkgs/development/tools/parsing/sdf/builder.sh
+++ b/pkgs/development/tools/parsing/sdf/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 configureFlags="--with-aterm=$aterm"
 
diff --git a/pkgs/development/tools/parsing/sglr/builder.sh b/pkgs/development/tools/parsing/sglr/builder.sh
index b366ccb79097..356a2b816b08 100644
--- a/pkgs/development/tools/parsing/sglr/builder.sh
+++ b/pkgs/development/tools/parsing/sglr/builder.sh
@@ -1,3 +1,3 @@
-. $stdenv/setup
+source $stdenv/setup
 configureFlags="--with-aterm=$aterm --with-toolbuslib=$toolbuslib --with-pt-support=$ptsupport"
 genericBuild
diff --git a/pkgs/games/quake3demo/builder.sh b/pkgs/games/quake3demo/builder.sh
index e2349144faa2..bc2922782550 100644
--- a/pkgs/games/quake3demo/builder.sh
+++ b/pkgs/games/quake3demo/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 skip=165
 
diff --git a/pkgs/games/quake3demo/make-wrapper.sh b/pkgs/games/quake3demo/make-wrapper.sh
index c7cf0a9308b0..373002a39bf3 100644
--- a/pkgs/games/quake3demo/make-wrapper.sh
+++ b/pkgs/games/quake3demo/make-wrapper.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 mkdir $out
 mkdir $out/bin
diff --git a/pkgs/games/ut2004demo/builder.sh b/pkgs/games/ut2004demo/builder.sh
index a5c8e1735b1e..0e7e3ed50721 100644
--- a/pkgs/games/ut2004demo/builder.sh
+++ b/pkgs/games/ut2004demo/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 skip=7976
 
diff --git a/pkgs/games/ut2004demo/make-wrapper.sh b/pkgs/games/ut2004demo/make-wrapper.sh
index 0df8b9c6e829..d165127f0a6e 100644
--- a/pkgs/games/ut2004demo/make-wrapper.sh
+++ b/pkgs/games/ut2004demo/make-wrapper.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 mkdir $out
 mkdir $out/bin
diff --git a/pkgs/misc/ghostscript/builder.sh b/pkgs/misc/ghostscript/builder.sh
index bd5a302fcb8e..1a2f51b9f9ad 100644
--- a/pkgs/misc/ghostscript/builder.sh
+++ b/pkgs/misc/ghostscript/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 postInstall=postInstall
 postInstall() {
diff --git a/pkgs/misc/nix/builder.sh b/pkgs/misc/nix/builder.sh
index a42bae72f0e9..0decd4f50c38 100644
--- a/pkgs/misc/nix/builder.sh
+++ b/pkgs/misc/nix/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 configureFlags="\
   --with-store-dir=$storeDir --localstatedir=$stateDir \
diff --git a/pkgs/misc/tex/nix/animatedot.sh b/pkgs/misc/tex/nix/animatedot.sh
index fadd490a5d91..2e1868d4bebd 100644
--- a/pkgs/misc/tex/nix/animatedot.sh
+++ b/pkgs/misc/tex/nix/animatedot.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 ensureDir $out
 
diff --git a/pkgs/misc/tex/nix/dot2pdf.sh b/pkgs/misc/tex/nix/dot2pdf.sh
index 816fe9b01eef..76cfbb49d283 100644
--- a/pkgs/misc/tex/nix/dot2pdf.sh
+++ b/pkgs/misc/tex/nix/dot2pdf.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 ensureDir $out
 
diff --git a/pkgs/misc/tex/nix/run-latex.sh b/pkgs/misc/tex/nix/run-latex.sh
index ecc6c99f096a..31056094fc22 100644
--- a/pkgs/misc/tex/nix/run-latex.sh
+++ b/pkgs/misc/tex/nix/run-latex.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 ensureDir $out
 
diff --git a/pkgs/misc/tex/tetex/builder.sh b/pkgs/misc/tex/tetex/builder.sh
index 6e5b1066d533..7f3dfa3d3585 100644
--- a/pkgs/misc/tex/tetex/builder.sh
+++ b/pkgs/misc/tex/tetex/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 postUnpack=postUnpack
 postUnpack() {
diff --git a/pkgs/misc/uml-utilities/builder.sh b/pkgs/misc/uml-utilities/builder.sh
index 9ad012504c5a..cb89fa14bc66 100644
--- a/pkgs/misc/uml-utilities/builder.sh
+++ b/pkgs/misc/uml-utilities/builder.sh
@@ -1,5 +1,5 @@
 buildinputs=""
-. $stdenv/setup
+source $stdenv/setup
 
 tar xvfj $src
 cd tools
diff --git a/pkgs/misc/uml/builder.sh b/pkgs/misc/uml/builder.sh
index f2a615494f58..be1f7f183550 100644
--- a/pkgs/misc/uml/builder.sh
+++ b/pkgs/misc/uml/builder.sh
@@ -1,7 +1,7 @@
-. $stdenv/setup
+source $stdenv/setup
 
 # !!! hack
-. $NIX_GCC/nix-support/add-flags
+source $NIX_GCC/nix-support/add-flags
 export NIX_LDFLAGS
 
 postUnpack() {
diff --git a/pkgs/os-specific/linux/dietlibc-wrapper/builder.sh b/pkgs/os-specific/linux/dietlibc-wrapper/builder.sh
index a84f2e5ce62f..5f941e2e7042 100644
--- a/pkgs/os-specific/linux/dietlibc-wrapper/builder.sh
+++ b/pkgs/os-specific/linux/dietlibc-wrapper/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 #export NIX_GLIBC_FLAGS_SET=1
 
diff --git a/pkgs/os-specific/linux/dietlibc/builder.sh b/pkgs/os-specific/linux/dietlibc/builder.sh
index a8daa6c09cf3..7947969f5f38 100644
--- a/pkgs/os-specific/linux/dietlibc/builder.sh
+++ b/pkgs/os-specific/linux/dietlibc/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 preBuild() {
   kernelhash=$(ls $kernel/lib/modules)
diff --git a/pkgs/os-specific/linux/e2fsprogs-diet/builder.sh b/pkgs/os-specific/linux/e2fsprogs-diet/builder.sh
index bfd442c84e42..7715ac23ff9d 100644
--- a/pkgs/os-specific/linux/e2fsprogs-diet/builder.sh
+++ b/pkgs/os-specific/linux/e2fsprogs-diet/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 export NIX_GLIBC_FLAGS_SET=1
 
diff --git a/pkgs/os-specific/linux/e2fsprogs/builder.sh b/pkgs/os-specific/linux/e2fsprogs/builder.sh
index 050ca2d2a980..07a6d756dd09 100644
--- a/pkgs/os-specific/linux/e2fsprogs/builder.sh
+++ b/pkgs/os-specific/linux/e2fsprogs/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 installPhase() {
    make install
diff --git a/pkgs/os-specific/linux/iputils/builder.sh b/pkgs/os-specific/linux/iputils/builder.sh
index e6f482d17bd7..d1b05109aee3 100644
--- a/pkgs/os-specific/linux/iputils/builder.sh
+++ b/pkgs/os-specific/linux/iputils/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 tar zxvf $src
 cd iputils
diff --git a/pkgs/os-specific/linux/kernel-headers-arm/builder.sh b/pkgs/os-specific/linux/kernel-headers-arm/builder.sh
index 6a52c8185589..fa91ae105916 100644
--- a/pkgs/os-specific/linux/kernel-headers-arm/builder.sh
+++ b/pkgs/os-specific/linux/kernel-headers-arm/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 
 buildPhase() {
diff --git a/pkgs/os-specific/linux/kernel-headers/builder.sh b/pkgs/os-specific/linux/kernel-headers/builder.sh
index 1b734c5f4267..f4920edd355c 100644
--- a/pkgs/os-specific/linux/kernel-headers/builder.sh
+++ b/pkgs/os-specific/linux/kernel-headers/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 
 buildPhase() {
diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh
index 3632ddc50d93..a48865443dac 100644
--- a/pkgs/os-specific/linux/kernel/builder.sh
+++ b/pkgs/os-specific/linux/kernel/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 buildPhase() {
 	cp $config .config
diff --git a/pkgs/os-specific/linux/klibc/builder.sh b/pkgs/os-specific/linux/klibc/builder.sh
index a8daa6c09cf3..7947969f5f38 100644
--- a/pkgs/os-specific/linux/klibc/builder.sh
+++ b/pkgs/os-specific/linux/klibc/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 preBuild() {
   kernelhash=$(ls $kernel/lib/modules)
diff --git a/pkgs/os-specific/linux/mingetty-wrapper/builder.sh b/pkgs/os-specific/linux/mingetty-wrapper/builder.sh
index 0295faa8d2eb..3797b62340c9 100644
--- a/pkgs/os-specific/linux/mingetty-wrapper/builder.sh
+++ b/pkgs/os-specific/linux/mingetty-wrapper/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 #. $makeWrapper
 
 ensureDir "$(dirname $out)"
diff --git a/pkgs/os-specific/linux/mingetty/builder.sh b/pkgs/os-specific/linux/mingetty/builder.sh
index d5e847db7421..2a2d5005455f 100644
--- a/pkgs/os-specific/linux/mingetty/builder.sh
+++ b/pkgs/os-specific/linux/mingetty/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 echo $out
 
diff --git a/pkgs/os-specific/linux/net-tools/builder.sh b/pkgs/os-specific/linux/net-tools/builder.sh
index c7f9975866ae..5f9583980b04 100644
--- a/pkgs/os-specific/linux/net-tools/builder.sh
+++ b/pkgs/os-specific/linux/net-tools/builder.sh
@@ -1,5 +1,5 @@
 buildinputs=""
-. $stdenv/setup
+source $stdenv/setup
 
 tar xvfj $src
 cd net-tools-*
diff --git a/pkgs/os-specific/linux/procps/builder.sh b/pkgs/os-specific/linux/procps/builder.sh
index 9351c6c557db..436df18fef52 100644
--- a/pkgs/os-specific/linux/procps/builder.sh
+++ b/pkgs/os-specific/linux/procps/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 export DESTDIR=$out
 
diff --git a/pkgs/os-specific/linux/shadow/builder.sh b/pkgs/os-specific/linux/shadow/builder.sh
index 28ea67d098fa..3a387e3deeda 100644
--- a/pkgs/os-specific/linux/shadow/builder.sh
+++ b/pkgs/os-specific/linux/shadow/builder.sh
@@ -1,3 +1,3 @@
-. $stdenv/setup
+source $stdenv/setup
                                                                                 
 genericBuild
diff --git a/pkgs/os-specific/linux/syslinux/builder.sh b/pkgs/os-specific/linux/syslinux/builder.sh
index fc4a05e91483..732c288cd121 100644
--- a/pkgs/os-specific/linux/syslinux/builder.sh
+++ b/pkgs/os-specific/linux/syslinux/builder.sh
@@ -1,5 +1,5 @@
 buildinputs=""
-. $stdenv/setup
+source $stdenv/setup
 
 #tar xvfj $src
 #cd syslinux-3.09
diff --git a/pkgs/os-specific/linux/util-linux/builder.sh b/pkgs/os-specific/linux/util-linux/builder.sh
index 8e0d2ebc58f0..c61ce6798b0b 100644
--- a/pkgs/os-specific/linux/util-linux/builder.sh
+++ b/pkgs/os-specific/linux/util-linux/builder.sh
@@ -1,3 +1,3 @@
-. $stdenv/setup
+source $stdenv/setup
 export DESTDIR=$out
 genericBuild
diff --git a/pkgs/servers/ftp/vsftpd/builder.sh b/pkgs/servers/ftp/vsftpd/builder.sh
index 323b6d1699ac..76f361d97b10 100644
--- a/pkgs/servers/ftp/vsftpd/builder.sh
+++ b/pkgs/servers/ftp/vsftpd/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 ensureDir "$out/bin"
 ensureDir "$out/sbin"
diff --git a/pkgs/servers/http/apache-httpd/builder.sh b/pkgs/servers/http/apache-httpd/builder.sh
index 91d05400b5e3..35d33db9c1d2 100644
--- a/pkgs/servers/http/apache-httpd/builder.sh
+++ b/pkgs/servers/http/apache-httpd/builder.sh
@@ -1,5 +1,5 @@
 buildInputs="$openssl $db4 $expat $perl"
-. $stdenv/setup
+source $stdenv/setup
 
 configureFlags="--with-expat=$expat --enable-mods-shared=all --without-gdbm \
  --enable-threads --with-devrandom=/dev/urandom"
diff --git a/pkgs/servers/http/jetty/bin-builder.sh b/pkgs/servers/http/jetty/bin-builder.sh
index bfd8f95b5404..1da42099dca4 100644
--- a/pkgs/servers/http/jetty/bin-builder.sh
+++ b/pkgs/servers/http/jetty/bin-builder.sh
@@ -1,6 +1,6 @@
 set -e
 
-. $stdenv/setup
+source $stdenv/setup
 
 unzip $src
 mkdir $out
diff --git a/pkgs/servers/http/tomcat/builder.sh b/pkgs/servers/http/tomcat/builder.sh
index e70807437e11..5f858d1cff8e 100644
--- a/pkgs/servers/http/tomcat/builder.sh
+++ b/pkgs/servers/http/tomcat/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup || exit 1
+source $stdenv/setup || exit 1
 
 tar zxf $src
 cd jakarta-tomcat*/bin
diff --git a/pkgs/servers/sql/postgresql/builder.sh b/pkgs/servers/sql/postgresql/builder.sh
index 26144d2d02a5..20e50ec1ec6f 100755
--- a/pkgs/servers/sql/postgresql/builder.sh
+++ b/pkgs/servers/sql/postgresql/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 export LANG=en_US
 
diff --git a/pkgs/servers/sql/postgresql/jdbc/builder.sh b/pkgs/servers/sql/postgresql/jdbc/builder.sh
index 61afeab6646b..318a4e637a0e 100755
--- a/pkgs/servers/sql/postgresql/jdbc/builder.sh
+++ b/pkgs/servers/sql/postgresql/jdbc/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 set -e
 
diff --git a/pkgs/shells/bash/builder.sh b/pkgs/shells/bash/builder.sh
index c1ae41a8c532..56ca1745dae4 100644
--- a/pkgs/shells/bash/builder.sh
+++ b/pkgs/shells/bash/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 genericBuild
 cd $out/bin
 ln -s bash sh
diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh
index eb68a9782a06..74df18ac838c 100644
--- a/pkgs/stdenv/generic/builder.sh
+++ b/pkgs/stdenv/generic/builder.sh
@@ -4,8 +4,8 @@ p3=$param3
 p4=$param4
 p5=$param5
 
-. $stdenv/setup
-. $substitute
+source $stdenv/setup
+source $substitute
 
 mkdir $out
 
diff --git a/pkgs/stdenv/generic/default-builder.sh b/pkgs/stdenv/generic/default-builder.sh
index 9a297c67f6e8..273fc55c7552 100644
--- a/pkgs/stdenv/generic/default-builder.sh
+++ b/pkgs/stdenv/generic/default-builder.sh
@@ -1,2 +1,2 @@
-. $stdenv/setup
+source $stdenv/setup
 genericBuild
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 7998e5b69f92..a56eba343dc3 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -22,7 +22,7 @@ param3=@param3@
 param4=@param4@
 param5=@param5@
 if test -n "@preHook@"; then
-    . @preHook@
+    source @preHook@
 fi
 
 
@@ -33,7 +33,7 @@ if test -z "$SHELL"; then echo "SHELL not set"; exit 1; fi
 # Hack: run gcc's setup hook.
 envHooks=()
 if test -f $NIX_GCC/nix-support/setup-hook; then
-    . $NIX_GCC/nix-support/setup-hook
+    source $NIX_GCC/nix-support/setup-hook
 fi
 
     
@@ -81,7 +81,7 @@ findInputs()
     pkgs="$pkgs $pkg "
 
     if test -f $pkg/nix-support/setup-hook; then
-        . $pkg/nix-support/setup-hook
+        source $pkg/nix-support/setup-hook
     fi
     
     if test -f $pkg/nix-support/propagated-build-inputs; then
@@ -162,7 +162,7 @@ export TZ=UTC
 
 # Execute the post-hook.
 if test -n "@postHook@"; then
-    . @postHook@
+    source @postHook@
 fi
 
 PATH=$_PATH${_PATH:+:}$PATH
diff --git a/pkgs/test/rpath/builder.sh b/pkgs/test/rpath/builder.sh
index 0a75e1cd33a7..2bf624621468 100644
--- a/pkgs/test/rpath/builder.sh
+++ b/pkgs/test/rpath/builder.sh
@@ -1,6 +1,6 @@
 export NIX_DEBUG=1
 
-. $stdenv/setup
+source $stdenv/setup
 
 mkdir $out
 mkdir $out/bin
diff --git a/pkgs/test/simple/builder.sh b/pkgs/test/simple/builder.sh
index dcfa49bd9c31..65f7e4c11ba1 100644
--- a/pkgs/test/simple/builder.sh
+++ b/pkgs/test/simple/builder.sh
@@ -2,7 +2,7 @@ set -x
 
 export NIX_DEBUG=1
 
-. $stdenv/setup
+source $stdenv/setup
 
 export NIX_ENFORCE_PURITY=1
 
diff --git a/pkgs/tools/archivers/unzip/builder.sh b/pkgs/tools/archivers/unzip/builder.sh
index 0166eecce6b7..fc38b0043813 100644
--- a/pkgs/tools/archivers/unzip/builder.sh
+++ b/pkgs/tools/archivers/unzip/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 builder() {
     make -f unix/Makefile generic
diff --git a/pkgs/tools/archivers/zip/builder.sh b/pkgs/tools/archivers/zip/builder.sh
index 16a124bd37cb..71146cbee4d0 100644
--- a/pkgs/tools/archivers/zip/builder.sh
+++ b/pkgs/tools/archivers/zip/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 makeFlags="-f unix/Makefile generic"
 
diff --git a/pkgs/tools/compression/bsdiff/builder.sh b/pkgs/tools/compression/bsdiff/builder.sh
index 46fb9e0ff165..1acb10cb7946 100644
--- a/pkgs/tools/compression/bsdiff/builder.sh
+++ b/pkgs/tools/compression/bsdiff/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 installFlags="PREFIX=$out INSTALL=install"
 
diff --git a/pkgs/tools/compression/bzip2/builder.sh b/pkgs/tools/compression/bzip2/builder.sh
index c88724f2d21b..51c911ad161b 100644
--- a/pkgs/tools/compression/bzip2/builder.sh
+++ b/pkgs/tools/compression/bzip2/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 installFlags="PREFIX=$out"
 
 preBuild=preBuild
diff --git a/pkgs/tools/compression/zdelta/builder.sh b/pkgs/tools/compression/zdelta/builder.sh
index 0760ae8357b2..adbddfdf9f5a 100644
--- a/pkgs/tools/compression/zdelta/builder.sh
+++ b/pkgs/tools/compression/zdelta/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 installPhase=installPhase
 installPhase() {
diff --git a/pkgs/tools/graphics/graphviz/builder.sh b/pkgs/tools/graphics/graphviz/builder.sh
index 56b012f4563a..6c7d4c42b83c 100644
--- a/pkgs/tools/graphics/graphviz/builder.sh
+++ b/pkgs/tools/graphics/graphviz/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 configureFlags="\
     --with-pngincludedir=$libpng/include \
diff --git a/pkgs/tools/misc/findutils-wrapper/builder.sh b/pkgs/tools/misc/findutils-wrapper/builder.sh
index 2dfd942f6871..60d38ec596ed 100644
--- a/pkgs/tools/misc/findutils-wrapper/builder.sh
+++ b/pkgs/tools/misc/findutils-wrapper/builder.sh
@@ -1,5 +1,5 @@
-. $stdenv/setup
-. $makeWrapper
+source $stdenv/setup
+source $makeWrapper
 
 makeWrapper "$findutils/bin/locate" "$out/bin/locate" \
 --database=/var/locatedb
diff --git a/pkgs/tools/misc/getopt/builder.sh b/pkgs/tools/misc/getopt/builder.sh
index 0b1da9d66123..a220ad0c66fb 100644
--- a/pkgs/tools/misc/getopt/builder.sh
+++ b/pkgs/tools/misc/getopt/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 installFlags="prefix=$out"
 makeFlags="CFLAGS=-DWITHOUT_GETTEXT LIBCGETOPT=0"
 genericBuild
diff --git a/pkgs/tools/misc/grub-wrapper/builder.sh b/pkgs/tools/misc/grub-wrapper/builder.sh
index 122046ab433a..95d39923512a 100644
--- a/pkgs/tools/misc/grub-wrapper/builder.sh
+++ b/pkgs/tools/misc/grub-wrapper/builder.sh
@@ -1,5 +1,5 @@
-. $stdenv/setup
-. $makeWrapper
+source $stdenv/setup
+source $makeWrapper
 
 makeWrapper "$grub/sbin/grub-install" "$out/sbin/grub-install" \
 --suffix-each PATH ':' "$diffutils/bin $gnused/bin $gnugrep/bin"
diff --git a/pkgs/tools/misc/less/builder.sh b/pkgs/tools/misc/less/builder.sh
index d38440648e99..0b61d421abc4 100644
--- a/pkgs/tools/misc/less/builder.sh
+++ b/pkgs/tools/misc/less/builder.sh
@@ -1,3 +1,3 @@
-. $stdenv/setup
+source $stdenv/setup
 
 genericBuild
diff --git a/pkgs/tools/misc/screen/builder.sh b/pkgs/tools/misc/screen/builder.sh
index d38440648e99..0b61d421abc4 100644
--- a/pkgs/tools/misc/screen/builder.sh
+++ b/pkgs/tools/misc/screen/builder.sh
@@ -1,3 +1,3 @@
-. $stdenv/setup
+source $stdenv/setup
 
 genericBuild
diff --git a/pkgs/tools/networking/bittorrent/builder.sh b/pkgs/tools/networking/bittorrent/builder.sh
index 84904ccfae46..7b93d5db8ba2 100644
--- a/pkgs/tools/networking/bittorrent/builder.sh
+++ b/pkgs/tools/networking/bittorrent/builder.sh
@@ -1,5 +1,5 @@
-. $stdenv/setup
-. $makeWrapper
+source $stdenv/setup
+source $makeWrapper
 
 buildPhase=buildPhase
 buildPhase() {
diff --git a/pkgs/tools/networking/cksfv/builder.sh b/pkgs/tools/networking/cksfv/builder.sh
index 18b63b2fd615..63e914092a5e 100644
--- a/pkgs/tools/networking/cksfv/builder.sh
+++ b/pkgs/tools/networking/cksfv/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup || exit 1
+source $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
 cd cksfv-*/src || exit 1
diff --git a/pkgs/tools/networking/dhcp-wrapper/builder.sh b/pkgs/tools/networking/dhcp-wrapper/builder.sh
index 037453a1882b..12a0f28ce1ca 100644
--- a/pkgs/tools/networking/dhcp-wrapper/builder.sh
+++ b/pkgs/tools/networking/dhcp-wrapper/builder.sh
@@ -1,5 +1,5 @@
-. $stdenv/setup
-. $makeWrapper
+source $stdenv/setup
+source $makeWrapper
 
 makeWrapper "$dhcp/sbin/dhclient" "$out/sbin/dhclient" \
 --set PATH_DHCLIENT_SCRIPT "$dhcp/sbin/dhclient-script"
diff --git a/pkgs/tools/networking/dhcp/builder.sh b/pkgs/tools/networking/dhcp/builder.sh
index e2e61fd4e94c..56f506d1fbca 100755
--- a/pkgs/tools/networking/dhcp/builder.sh
+++ b/pkgs/tools/networking/dhcp/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 export DESTDIR=$out
 
diff --git a/pkgs/tools/networking/openssh/builder.sh b/pkgs/tools/networking/openssh/builder.sh
index d5d4cb6a1cc6..198c809a49ed 100644
--- a/pkgs/tools/networking/openssh/builder.sh
+++ b/pkgs/tools/networking/openssh/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 
 configureFlags="--with-privsep-path=$out/empty"
diff --git a/pkgs/tools/networking/par2cmdline/builder.sh b/pkgs/tools/networking/par2cmdline/builder.sh
index 0dbb5e0a57b1..69fe4da4b4bc 100644
--- a/pkgs/tools/networking/par2cmdline/builder.sh
+++ b/pkgs/tools/networking/par2cmdline/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup || exit 1
+source $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
 cd par2cmdline-* || exit 1
diff --git a/pkgs/tools/security/gnupg/builder.sh b/pkgs/tools/security/gnupg/builder.sh
index d38440648e99..0b61d421abc4 100644
--- a/pkgs/tools/security/gnupg/builder.sh
+++ b/pkgs/tools/security/gnupg/builder.sh
@@ -1,3 +1,3 @@
-. $stdenv/setup
+source $stdenv/setup
 
 genericBuild
diff --git a/pkgs/tools/security/mktemp/builder.sh b/pkgs/tools/security/mktemp/builder.sh
index 8397626c00fd..896ef4263989 100644
--- a/pkgs/tools/security/mktemp/builder.sh
+++ b/pkgs/tools/security/mktemp/builder.sh
@@ -1,3 +1,3 @@
-. $stdenv/setup
+source $stdenv/setup
  
 genericBuild
diff --git a/pkgs/tools/security/nmap/builder.sh b/pkgs/tools/security/nmap/builder.sh
index 8397626c00fd..896ef4263989 100644
--- a/pkgs/tools/security/nmap/builder.sh
+++ b/pkgs/tools/security/nmap/builder.sh
@@ -1,3 +1,3 @@
-. $stdenv/setup
+source $stdenv/setup
  
 genericBuild
diff --git a/pkgs/tools/system/which/builder.sh b/pkgs/tools/system/which/builder.sh
index 3c09d5ff1374..e5ef90829fbb 100644
--- a/pkgs/tools/system/which/builder.sh
+++ b/pkgs/tools/system/which/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup || exit 1
+source $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
 cd which-* || exit 1
diff --git a/pkgs/tools/text/diffutils/builder.sh b/pkgs/tools/text/diffutils/builder.sh
index 58dcc3d8ad0e..6c508ed5614c 100644
--- a/pkgs/tools/text/diffutils/builder.sh
+++ b/pkgs/tools/text/diffutils/builder.sh
@@ -1,3 +1,3 @@
-. $stdenv/setup
+source $stdenv/setup
 if test -n "$coreutils"; then PATH=$coreutils/bin:$PATH; fi
 genericBuild
\ No newline at end of file
diff --git a/pkgs/tools/text/ed/builder.sh b/pkgs/tools/text/ed/builder.sh
index 0c4430cf2acf..0e82ef42ccc7 100644
--- a/pkgs/tools/text/ed/builder.sh
+++ b/pkgs/tools/text/ed/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup || exit 1
+source $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
 cd ed-* || exit 1
diff --git a/pkgs/tools/text/gnupatch/builder.sh b/pkgs/tools/text/gnupatch/builder.sh
index 0dc0ba871d96..35eaebe56c70 100644
--- a/pkgs/tools/text/gnupatch/builder.sh
+++ b/pkgs/tools/text/gnupatch/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup || exit 1
+source $stdenv/setup || exit 1
 
 tar xvfz $src || exit 1
 cd patch-* || exit 1
diff --git a/pkgs/tools/text/xml/jing/script-builder.sh b/pkgs/tools/text/xml/jing/script-builder.sh
index b0c4648404c5..e989615bee49 100644
--- a/pkgs/tools/text/xml/jing/script-builder.sh
+++ b/pkgs/tools/text/xml/jing/script-builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup || exit 1
+source $stdenv/setup || exit 1
 
 mkdir -p $out/bin || exit 1
 
diff --git a/pkgs/tools/text/xml/jing/unzip-builder.sh b/pkgs/tools/text/xml/jing/unzip-builder.sh
index c8cb54a2a0f9..5f8738da51cf 100755
--- a/pkgs/tools/text/xml/jing/unzip-builder.sh
+++ b/pkgs/tools/text/xml/jing/unzip-builder.sh
@@ -1,5 +1,5 @@
 set -e
-. $stdenv/setup
+source $stdenv/setup
 
 $unzip/bin/unzip $src
 mkdir -p $out
diff --git a/pkgs/tools/typesetting/bibtex-tools/builder.sh b/pkgs/tools/typesetting/bibtex-tools/builder.sh
index acdecca0665f..bb7538e38afb 100644
--- a/pkgs/tools/typesetting/bibtex-tools/builder.sh
+++ b/pkgs/tools/typesetting/bibtex-tools/builder.sh
@@ -1,4 +1,4 @@
-. $stdenv/setup
+source $stdenv/setup
 
 configureFlags="--with-aterm=$aterm --with-sdf=$sdf --with-strategoxt=$strategoxt --with-hevea=$hevea --with-latex=$tetex"
 genericBuild
diff --git a/pkgs/tools/typesetting/hevea/builder.sh b/pkgs/tools/typesetting/hevea/builder.sh
index 645555847087..7598da5d0a57 100644
--- a/pkgs/tools/typesetting/hevea/builder.sh
+++ b/pkgs/tools/typesetting/hevea/builder.sh
@@ -1,6 +1,6 @@
 set -e
 
-. $stdenv/setup
+source $stdenv/setup
 
 mkdir -p $out/bin $out/lib