Adding xulrunner for Firefox3. Unfortunately, interface updates kill MPlayer plugin anyway

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

1 files changed, 15 insertions, 0 deletions

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46e63b014c4..a73d236c50f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -374,6 +374,8 @@ let pkgs = rec {
 
   writeScriptBin = name: text: runCommand name {inherit text;} "mkdir -p \$out/bin; echo -n \"\$text\" > \$out/bin/\$name ; chmod +x \$out/bin/\$name";
 
+  symlinkJoin = name: paths: runCommand name {inherit paths;} "mkdir -p $out; for i in $paths; do ${xorg.lndir}/bin/lndir $i $out; done";
+
   substituteAll = import ../build-support/substitute/substitute-all.nix {
     inherit stdenv;
   };
@@ -6031,6 +6033,19 @@ let pkgs = rec {
     #enableOfficialBranding = true;
   });
 
+  xulrunner3 = lowPrio (import ../applications/networking/browsers/firefox-3/xulrunner.nix {
+    inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
+      python dbus dbus_glib freetype fontconfig bzip2 xlibs file;
+    inherit (gtkLibs) gtk pango;
+    inherit (gnome) libIDL;
+    #enableOfficialBranding = true;
+  });
+
+  firefox3Xul=(symlinkJoin "firefox-3-with-xulrunner" [firefox3 xulrunner3]) //
+  {
+    inherit (firefox) gtk;
+  };
+
   firefox3b1Bin = lowPrio (import ../applications/networking/browsers/firefox-3/binary.nix {
     inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
       python curl coreutils freetype fontconfig;