From 7070dc098669d9c85e7741414f5afda4050b7f42 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 19 Sep 2004 15:24:01 +0000
Subject: [PATCH] * Allow Firefox to be started again when there already is a
 running   instance.

svn path=/nixpkgs/trunk/; revision=1464
---
 pkgs/applications/networking/browsers/firefox/builder.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/builder.sh b/pkgs/applications/networking/browsers/firefox/builder.sh
index cbf2eab2c1a..d53ff776a15 100644
--- a/pkgs/applications/networking/browsers/firefox/builder.sh
+++ b/pkgs/applications/networking/browsers/firefox/builder.sh
@@ -8,7 +8,7 @@ ac_add_options --prefix=$out
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 ac_add_options --enable-xft
-ac_add_options --enable-swg
+#ac_add_options --enable-swg
 ac_add_options --enable-strip
 ac_add_options --enable-default-toolkit=gtk2
 #ac_add_options --disable-shared
@@ -25,3 +25,10 @@ strip -S $out/lib/*/* || true
 
 # We don't need this (do we?)
 rm -rf $out/include
+
+# 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.
+cd $out/bin
+mv firefox ../lib/firefox-*/
+ln -s ../lib/firefox-*/firefox .