* Fix Chatzilla (it doesn't work with recent Xulrunners).

* Get rid of xulrunnerWrapper.

svn path=/nixpkgs/trunk/; revision=29706
This commit is contained in:
Eelco Dolstra 2011-10-07 09:26:03 +00:00
parent e0c4e42d8c
commit 79ab307dd7
5 changed files with 27 additions and 54 deletions

View File

@ -1,14 +1,23 @@
{ stdenv, fetchurl, unzip }:
{ stdenv, fetchurl, unzip, xulrunner, makeWrapper }:
stdenv.mkDerivation {
name = "conkeror-1.0pre-20110917";
src = fetchurl {
url = http://repo.or.cz/w/conkeror.git/snapshot/9d1f522674379874e502545babe0c843f78fa43c.zip;
sha256 = "1ga3d9rc3xfaxvjnhnar752q9ga897q9fck0864i7rh0w7xbrhx2";
};
buildInputs = [ unzip ];
installPhase = ''
cp -v -r . $out
buildInputs = [ unzip makeWrapper ];
buildCommand = ''
mkdir -p $out/libexec/conkeror
unzip $src -d $out/libexec
makeWrapper ${xulrunner}/bin/xulrunner $out/bin/conkeror \
--add-flags $out/libexec/conkeror/application.ini
'';
meta = {
description = "A keyboard-oriented, customizable, extensible web browser";
longDescription = ''

View File

@ -1,19 +1,22 @@
{ stdenv, fetchurl, unzip }:
{ stdenv, fetchurl, unzip, xulrunner, makeWrapper }:
stdenv.mkDerivation rec {
name = "chatzilla-0.9.86.1";
name = "chatzilla-0.9.87";
src = fetchurl {
# Obtained from http://chatzilla.rdmsoft.com/xulrunner/.
url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.86.1-xr.zip;
sha256 = "06s4g0x7hsckd7wr904j8rzksvqhvcrhl9zwga2458rgafcbbghd";
url = http://chatzilla.rdmsoft.com/xulrunner/download/chatzilla-0.9.87-xr.zip;
sha256 = "1qwbqngrxyip3k2b71adg271sifvrrxcixkyrsy4vmgl5bwdsl4d";
};
buildInputs = [ unzip ];
buildInputs = [ unzip makeWrapper ];
buildCommand = ''
ensureDir $out
unzip $src -d $out
mkdir -p $out/libexec/chatzilla
unzip $src -d $out/libexec/chatzilla
makeWrapper ${xulrunner}/bin/xulrunner $out/bin/chatzilla \
--add-flags $out/libexec/chatzilla/application.ini
'';
meta = {

View File

@ -1,21 +0,0 @@
source $stdenv/setup
ensureDir $out/bin
wrapper="$out/bin/$launcher"
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
exec $runner $appfile "\$@"
EOF
chmod +x $wrapper

View File

@ -1,13 +0,0 @@
{stdenv, xulrunner, application, launcher}:
stdenv.mkDerivation {
name = application.name;
builder = ./builder.sh;
inherit xulrunner launcher;
appfile = application + "/application.ini";
inherit (application) meta;
}

View File

@ -6292,11 +6292,9 @@ let
cdrtools = callPackage ../applications/misc/cdrtools { };
chatzilla =
xulrunnerWrapper {
launcher = "chatzilla";
application = callPackage ../applications/networking/irc/chatzilla { };
};
chatzilla = callPackage ../applications/networking/irc/chatzilla {
xulrunner = firefox36Pkgs.xulrunner;
};
chrome = callPackage ../applications/networking/browsers/chromium {
inherit (gnome) GConf;
@ -6339,10 +6337,7 @@ let
comical = callPackage ../applications/graphics/comical { };
conkeror = xulrunnerWrapper {
launcher = "conkeror";
application = callPackage ../applications/networking/browsers/conkeror { };
};
conkeror = callPackage ../applications/networking/browsers/conkeror { };
cuneiform = builderDefsPackage (import ../tools/graphics/cuneiform) {
inherit cmake patchelf;