* 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

4 files changed, 17 insertions, 56 deletions

diff --git a/pkgs/development/interpreters/xulrunner/builder.sh b/pkgs/development/interpreters/xulrunner/builder.sh
deleted file mode 100644
index a065580b1c89..000000000000
--- a/pkgs/development/interpreters/xulrunner/builder.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-source $stdenv/setup
-
-postInstall=postInstall
-postInstall() {
-    strip -S $out/lib/*/* || true
-
-    # This fixes starting Firefox when there already is a running
-    # instance.  The `firefox' wrapper script actually expects to be
-    # in the same directory as `run-mozilla.sh', apparently.
-    libDir=$(cd $out/lib && ls -d xulrunner-*)
-    test -n "$libDir"
-    cd $out/bin
-    mv xulrunner ../lib/$libDir/
-    ln -s ../lib/$libDir/xulrunner .
-
-    echo "running xulrunner --register-global..."
-    $out/bin/xulrunner --register-global || true
-
-    # xulrunner wants to create these directories at the first startup
-    ensureDir $out/lib/$libDir/extensions
-    ensureDir $out/lib/$libDir/updates
-}
-
-genericBuild
diff --git a/pkgs/development/interpreters/xulrunner/default.nix b/pkgs/development/interpreters/xulrunner/default.nix
deleted file mode 100644
index ee1c87b59361..000000000000
--- a/pkgs/development/interpreters/xulrunner/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi}:
-
-stdenv.mkDerivation {
-  name = "xulrunner-1.8.0.4";
-
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.8.0.4/source/xulrunner-1.8.0.4-source.tar.bz2;
-    md5 = "4dc09831aa4e94fda5182a4897ed08e9";
-  };
-
-  buildInputs = [pkgconfig gtk perl zip libIDL libXi];
-  configureFlags = [
-    "--enable-application=xulrunner"
-    "--enable-optimize"
-    "--disable-debug"
-    "--enable-xft"
-    "--disable-freetype2"
-    "--enable-svg"
-    "--enable-strip"
-    "--enable-default-toolkit=gtk2"
-    "--with-system-jpeg"
-    "--with-system-png"
-    "--with-system-zlib"
-    "--disable-gnomevfs"
-    "--disable-gnomeui"
-    "--disable-javaxpcom"
-    ];
-}
diff --git a/pkgs/development/interpreters/xulrunner/wrapper/builder.sh b/pkgs/development/interpreters/xulrunner/wrapper/builder.sh
index 30561cbf1823..79247a160232 100644
--- a/pkgs/development/interpreters/xulrunner/wrapper/builder.sh
+++ b/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
diff --git a/pkgs/development/interpreters/xulrunner/wrapper/default.nix b/pkgs/development/interpreters/xulrunner/wrapper/default.nix
index 5d0ccccc674c..218dfd34cc1a 100644
--- a/pkgs/development/interpreters/xulrunner/wrapper/default.nix
+++ b/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;