* "ensureDir ./lib/xulrunner-*" doesn't work because ensureDir quotes
its argument, causing a directory named xulrunner-* to be created. As a result xulrunner couldn't find the extensions directory and wouldn't start. svn path=/nixpkgs/trunk/; revision=4815
This commit is contained in:
parent
04767dfdd9
commit
2cbcd0bd7a
|
@ -7,17 +7,18 @@ postInstall() {
|
||||||
# This fixes starting Firefox when there already is a running
|
# This fixes starting Firefox when there already is a running
|
||||||
# instance. The `firefox' wrapper script actually expects to be
|
# instance. The `firefox' wrapper script actually expects to be
|
||||||
# in the same directory as `run-mozilla.sh', apparently.
|
# in the same directory as `run-mozilla.sh', apparently.
|
||||||
|
libDir=$(cd $out/lib && ls xulrunner-*)
|
||||||
|
test -n "$libDir"
|
||||||
cd $out/bin
|
cd $out/bin
|
||||||
mv xulrunner ../lib/xulrunner-*/
|
mv xulrunner ../lib/$libDir/
|
||||||
ln -s ../lib/xulrunner-*/xulrunner .
|
ln -s ../lib/$libDir/xulrunner .
|
||||||
|
|
||||||
echo "running xulrunner --register-global..."
|
echo "running xulrunner --register-global..."
|
||||||
$out/bin/xulrunner --register-global || true
|
$out/bin/xulrunner --register-global || true
|
||||||
|
|
||||||
# xulrunner wants to create these directories at the first startup
|
# xulrunner wants to create these directories at the first startup
|
||||||
cd $out
|
ensureDir $out/lib/$libDir/extensions
|
||||||
ensureDir ./lib/xulrunner-*/extensions
|
ensureDir $out/lib/$libDir/updates
|
||||||
ensureDir ./lib/xulrunner-*/updates
|
|
||||||
}
|
}
|
||||||
|
|
||||||
genericBuild
|
genericBuild
|
||||||
|
|
Loading…
Reference in New Issue