From 549a4405e3b4e1dc29f24f8a938f16dfb8170bc3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Sep 2008 09:29:09 +0000 Subject: [PATCH] * 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 --- .../networking/irc/chatzilla/builder.sh | 5 ---- .../networking/irc/chatzilla/default.nix | 16 ++++++---- .../interpreters/xulrunner/builder.sh | 24 --------------- .../interpreters/xulrunner/default.nix | 29 ------------------- .../interpreters/xulrunner/wrapper/builder.sh | 18 ++++++++++-- .../xulrunner/wrapper/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 13 ++------- 7 files changed, 31 insertions(+), 76 deletions(-) delete mode 100755 pkgs/applications/networking/irc/chatzilla/builder.sh delete mode 100644 pkgs/development/interpreters/xulrunner/builder.sh delete mode 100644 pkgs/development/interpreters/xulrunner/default.nix diff --git a/pkgs/applications/networking/irc/chatzilla/builder.sh b/pkgs/applications/networking/irc/chatzilla/builder.sh deleted file mode 100755 index 84c189a559bd..000000000000 --- a/pkgs/applications/networking/irc/chatzilla/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -source $stdenv/setup - -ensureDir $out -unzip $src -d $out - diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix index ff979d39393b..0225436d468e 100644 --- a/pkgs/applications/networking/irc/chatzilla/default.nix +++ b/pkgs/applications/networking/irc/chatzilla/default.nix @@ -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"; diff --git a/pkgs/development/interpreters/xulrunner/builder.sh b/pkgs/development/interpreters/xulrunner/builder.sh deleted file mode 100644 index a065580b1c89..000000000000 --- a/pkgs/development/interpreters/xulrunner/builder.sh +++ /dev/null @@ -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 diff --git a/pkgs/development/interpreters/xulrunner/default.nix b/pkgs/development/interpreters/xulrunner/default.nix deleted file mode 100644 index ee1c87b59361..000000000000 --- a/pkgs/development/interpreters/xulrunner/default.nix +++ /dev/null @@ -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" - ]; -} diff --git a/pkgs/development/interpreters/xulrunner/wrapper/builder.sh b/pkgs/development/interpreters/xulrunner/wrapper/builder.sh index 30561cbf1823..79247a160232 100644 --- a/pkgs/development/interpreters/xulrunner/wrapper/builder.sh +++ b/pkgs/development/interpreters/xulrunner/wrapper/builder.sh @@ -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 <