10 files changed, 20 insertions, 15 deletions
diff --git a/test/build/gtk+-build.sh b/test/build/gtk+-build.sh
index 8c887fec4f02..d2b3d694a92c 100755
--- a/test/build/gtk+-build.sh
+++ b/test/build/gtk+-build.sh
@@ -2,7 +2,7 @@
 
 export PATH=$pkgconfig/bin:/bin:/usr/bin
 export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib
+export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib
 
 top=`pwd`
 tar xvfj $src
diff --git a/test/build/pan-build.sh b/test/build/pan-build.sh
index 468814ff6686..a29255881cdc 100755
--- a/test/build/pan-build.sh
+++ b/test/build/pan-build.sh
@@ -2,7 +2,7 @@
 
 export PATH=$pkgconfig/bin:$gnet/bin:/bin:/usr/bin
 export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig
-export LD_LIBRARY_PATH=$gnet/lib
+export LD_LIBRARY_PATH=$gnet/lib:$atk/lib:$pango/lib:$gtk/lib:$gnet/lib
 
 top=`pwd`
 tar xvfj $src
diff --git a/test/register b/test/register
index a50dd051a83f..60cabd292365 100755
--- a/test/register
+++ b/test/register
@@ -1,17 +1,22 @@
 #! /bin/sh
 
-nix init
-
 root=/home/eelco/Dev/nix/test
+cd $root
 
-cd $root/tmpl
+mkdir -p db
+mkdir -p pkg
+mkdir -p descr
+mkdir -p netcache
+
+nix init
 
-if ! nix-instantiate $root/descr $root/tmpl/*.nix; then
+if ! nix-instantiate descr netcache tmpl/*.nix; then
     exit 1;
 fi
 
-for i in $root/dist/*; do nix regfile $i; done
-for i in $root/descr/*; do 
+for i in netcache/*; do nix regfile $i; done
+for i in build/*; do nix regfile $i; done
+for i in descr/*; do 
     md5sum $i
     nix regfile $i
 done
diff --git a/test/tmpl/aterm-2.0.nix b/test/tmpl/aterm-2.0.nix
index b65714e6a63f..24c427fafa29 100644
--- a/test/tmpl/aterm-2.0.nix
+++ b/test/tmpl/aterm-2.0.nix
@@ -1,5 +1,5 @@
 # Original sources.
-src = ../dist/aterm-2.0.tar.gz
+src = url(http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.tar.gz)
 
 # Build script.
 build = ../build/aterm-build.sh
diff --git a/test/tmpl/atk-1.2.0.nix b/test/tmpl/atk-1.2.0.nix
index d540c90d8d8e..9899a95b1378 100644
--- a/test/tmpl/atk-1.2.0.nix
+++ b/test/tmpl/atk-1.2.0.nix
@@ -1,6 +1,6 @@
 pkgconfig <- ./pkgconfig-0.15.0.nix
 glib <- ./glib-2.2.1.nix
 
-src = ../dist/atk-1.2.0.tar.bz2
+src = url(ftp://ftp.gtk.org/pub/gtk/v2.2/atk-1.2.0.tar.bz2)
 
 build = ../build/atk-build.sh
diff --git a/test/tmpl/glib-2.2.1.nix b/test/tmpl/glib-2.2.1.nix
index 5e5c6efdd1c3..d9fdf0f1f9e1 100644
--- a/test/tmpl/glib-2.2.1.nix
+++ b/test/tmpl/glib-2.2.1.nix
@@ -1,5 +1,5 @@
 pkgconfig <- ./pkgconfig-0.15.0.nix
 
-src = ../dist/glib-2.2.1.tar.bz2
+src = url(ftp://ftp.gtk.org/pub/gtk/v2.2/glib-2.2.1.tar.bz2)
 
 build = ../build/glib-build.sh
diff --git a/test/tmpl/gnet-1.1.8.nix b/test/tmpl/gnet-1.1.8.nix
index 672cfdf5a806..7f2b33cab94a 100644
--- a/test/tmpl/gnet-1.1.8.nix
+++ b/test/tmpl/gnet-1.1.8.nix
@@ -1,6 +1,6 @@
 pkgconfig <- ./pkgconfig-0.15.0.nix
 glib <- ./glib-2.2.1.nix
 
-src = ../dist/gnet-1.1.8.tar.gz
+src = url(http://www.gnetlibrary.org/src/gnet-1.1.8.tar.gz)
 
 build = ../build/gnet-build.sh
diff --git a/test/tmpl/gtk+-2.2.1.nix b/test/tmpl/gtk+-2.2.1.nix
index 30c77aec39eb..b1a6fcbfb7ea 100644
--- a/test/tmpl/gtk+-2.2.1.nix
+++ b/test/tmpl/gtk+-2.2.1.nix
@@ -3,6 +3,6 @@ glib <- ./glib-2.2.1.nix
 atk <- ./atk-1.2.0.nix
 pango <- ./pango-1.2.1.nix
 
-src = ../dist/gtk+-2.2.1.tar.bz2
+src = url(ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.1.tar.bz2)
 
 build = ../build/gtk+-build.sh
diff --git a/test/tmpl/pango-1.2.1.nix b/test/tmpl/pango-1.2.1.nix
index 2436bc49a86a..4be4c899114a 100644
--- a/test/tmpl/pango-1.2.1.nix
+++ b/test/tmpl/pango-1.2.1.nix
@@ -1,6 +1,6 @@
 pkgconfig <- ./pkgconfig-0.15.0.nix
 glib <- ./glib-2.2.1.nix
 
-src = ../dist/pango-1.2.1.tar.bz2
+src = url(ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.1.tar.bz2)
 
 build = ../build/pango-build.sh
diff --git a/test/tmpl/pkgconfig-0.15.0.nix b/test/tmpl/pkgconfig-0.15.0.nix
index 882a69234112..3ee7c13cd179 100644
--- a/test/tmpl/pkgconfig-0.15.0.nix
+++ b/test/tmpl/pkgconfig-0.15.0.nix
@@ -1,3 +1,3 @@
-src = ../dist/pkgconfig-0.15.0.tar.gz
+src = url(http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.15.0.tar.gz)
 
 build = ../build/pkgconfig-build.sh