From 79ab307dd761ee1aa48123b5c63917e861cf672f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 7 Oct 2011 09:26:03 +0000 Subject: [PATCH] * Fix Chatzilla (it doesn't work with recent Xulrunners). * Get rid of xulrunnerWrapper. svn path=/nixpkgs/trunk/; revision=29706 --- .../networking/browsers/conkeror/default.nix | 17 +++++++++++---- .../networking/irc/chatzilla/default.nix | 17 ++++++++------- .../interpreters/xulrunner/wrapper/builder.sh | 21 ------------------- .../xulrunner/wrapper/default.nix | 13 ------------ pkgs/top-level/all-packages.nix | 13 ++++-------- 5 files changed, 27 insertions(+), 54 deletions(-) delete mode 100644 pkgs/development/interpreters/xulrunner/wrapper/builder.sh delete mode 100644 pkgs/development/interpreters/xulrunner/wrapper/default.nix diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index e9c1c926ba4..08196780143 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -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 = '' diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix index a0197a99a50..8ce73c69f3d 100644 --- a/pkgs/applications/networking/irc/chatzilla/default.nix +++ b/pkgs/applications/networking/irc/chatzilla/default.nix @@ -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 = { diff --git a/pkgs/development/interpreters/xulrunner/wrapper/builder.sh b/pkgs/development/interpreters/xulrunner/wrapper/builder.sh deleted file mode 100644 index 4deed9e7a7f..00000000000 --- a/pkgs/development/interpreters/xulrunner/wrapper/builder.sh +++ /dev/null @@ -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 <