* xulrunner-wrapper: use Firefox 3 directly (via "firefox -app"),

since it has full support for running XUL applications.  This saves
  a lot of space (you don't need two copies of basically the same
  software).
* Deleted the old xulrunner (1.8.0.4), it didn't compile anyway with
  recent GTK.
* Updated chatzilla to 0.9.83.

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

pkgs/development/interpreters/xulrunner/wrapper/builder.sh

@@ -2,10 +2,22 @@ source $stdenv/setup
 
 ensureDir $out/bin
 
+set -x
+
 wrapper="$out/bin/$launcher"
 
-echo "#! $SHELL -e" > $wrapper
-echo "" >> $wrapper
-echo "$xulrunner/bin/xulrunner $appfile \"\$@\"" >> $wrapper
+if test -e $xulrunner/bin/xulrunner; then
+    runner=$xulrunner/bin/xulrunner
+elif test -e $xulrunner/bin/firefox; then
+    runner="$xulrunner/bin/firefox -app"
+else
+    echo "XUL runner not found"
+    exit 1
+fi
+
+cat > $wrapper <<EOF
+#! $SHELL -e
+$runner $appfile "\$@"
+EOF
 
 chmod +x $wrapper

pkgs/development/interpreters/xulrunner/wrapper/default.nix

@@ -4,7 +4,9 @@ stdenv.mkDerivation {
   name = application.name;
 
   builder = ./builder.sh;
+  
   inherit xulrunner launcher;
+  
   appfile = application + "/application.ini";
 
   inherit (application) meta;