Author: eelco
Date: Fri Oct 7 09:26:03 2011
New Revision: 29706
URL: https://nixos.org/websvn/nix/?rev=29706&sc=1
Log:
* Fix Chatzilla (it doesn't work with recent Xulrunners).
* Get rid of xulrunnerWrapper.
Deleted:
nixpkgs/trunk/pkgs/development/interpreters/xulrunner/
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/conkeror/default.nix
nixpkgs/trunk/pkgs/applications/networking/irc/chatzilla/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/conkeror/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/conkeror/default.nix
Thu Oct 6 21:30:27 2011 (r29705)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/conkeror/default.nix
Fri Oct 7 09:26:03 2011 (r29706)
@@ -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 = ''
Modified: nixpkgs/trunk/pkgs/applications/networking/irc/chatzilla/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/irc/chatzilla/default.nix
Thu Oct 6 21:30:27 2011 (r29705)
+++ nixpkgs/trunk/pkgs/applications/networking/irc/chatzilla/default.nix
Fri Oct 7 09:26:03 2011 (r29706)
@@ -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 = {
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Oct 6 21:30:27
2011 (r29705)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Oct 7 09:26:03
2011 (r29706)
@@ -6292,11 +6292,9 @@
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 @@
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;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
