* 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
This commit is contained in:
Eelco Dolstra
parent
fd0b020c74
commit
549a4405e3
@ -1,5 +0,0 @@
|
||||
source $stdenv/setup
|
||||
|
||||
ensureDir $out
|
||||
unzip $src -d $out
|
||||
|
||||
@ -1,18 +1,24 @@
|
||||
{stdenv, fetchurl, unzip}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "chatzilla-0.9.79";
|
||||
|
||||
builder = ./builder.sh;
|
||||
name = "chatzilla-0.9.83";
|
||||
|
||||
src = fetchurl {
|
||||
# Obtained from http://chatzilla.rdmsoft.com/xulrunner/.
|
||||
url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.79-xr.zip;
|
||||
sha256 = "0irbi8y4y2nlbwvhmmln5h5f4wv7spd1rqg7dxg7pc93s09p5i09";
|
||||
url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.83-xr.zip;
|
||||
sha256 = "0dzk0k9gmzy7sqbiszakd69pjr4h6pfdsb3s6zbx4gc46z4n3shx";
|
||||
};
|
||||
|
||||
buildInputs = [unzip];
|
||||
|
||||
buildCommand = ''
|
||||
ensureDir $out
|
||||
unzip $src -d $out
|
||||
|
||||
# Fix overly restrictive version specification.
|
||||
substituteInPlace $out/application.ini --replace 'MaxVersion=1.9' 'MaxVersion=1.9.0.999'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://chatzilla.hacksrus.com/;
|
||||
description = "Stand-alone version of Chatzilla, an IRC client";
|
||||
|
||||
@ -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
|
||||
@ -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"
|
||||
];
|
||||
}
|
||||
@ -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
|
||||
|
||||
@ -4,7 +4,9 @@ stdenv.mkDerivation {
|
||||
name = application.name;
|
||||
|
||||
builder = ./builder.sh;
|
||||
|
||||
inherit xulrunner launcher;
|
||||
|
||||
appfile = application + "/application.ini";
|
||||
|
||||
inherit (application) meta;
|
||||
|
||||
@ -2059,16 +2059,10 @@ let
|
||||
inherit fetchurl stdenv;
|
||||
};
|
||||
|
||||
xulrunner = import ../development/interpreters/xulrunner {
|
||||
inherit fetchurl stdenv pkgconfig perl zip;
|
||||
inherit (gtkLibs) gtk;
|
||||
inherit (gnome) libIDL;
|
||||
inherit (xlibs) libXi;
|
||||
};
|
||||
|
||||
xulrunnerWrapper = {application, launcher}:
|
||||
import ../development/interpreters/xulrunner/wrapper {
|
||||
inherit stdenv xulrunner application launcher;
|
||||
inherit stdenv application launcher;
|
||||
xulrunner = firefox3;
|
||||
};
|
||||
|
||||
|
||||
@ -6168,8 +6162,7 @@ let
|
||||
#enableOfficialBranding = true;
|
||||
});
|
||||
|
||||
firefox3Xul=(symlinkJoin "firefox-3-with-xulrunner" [firefox3 xulrunner3]) //
|
||||
{
|
||||
firefox3Xul = (symlinkJoin "firefox-3-with-xulrunner" [firefox3 xulrunner3]) // {
|
||||
inherit (firefox) gtk;
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user