summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2009-08-09 18:26:16 +0000
committerLudovic Courtès <ludo@gnu.org>2009-08-09 18:26:16 +0000
commit5c37e492994781c580ad5605e903a1e8d0c393b0 (patch)
tree7f957d7d7d1c423e2461f7bbea0fb23ef4554dbb
parenta42b80d2217934870f9a535308d08c841ee125b5 (diff)
downloadnixpkgs-5c37e492994781c580ad5605e903a1e8d0c393b0.tar
nixpkgs-5c37e492994781c580ad5605e903a1e8d0c393b0.tar.gz
nixpkgs-5c37e492994781c580ad5605e903a1e8d0c393b0.tar.bz2
nixpkgs-5c37e492994781c580ad5605e903a1e8d0c393b0.tar.lz
nixpkgs-5c37e492994781c580ad5605e903a1e8d0c393b0.tar.xz
nixpkgs-5c37e492994781c580ad5605e903a1e8d0c393b0.tar.zst
nixpkgs-5c37e492994781c580ad5605e903a1e8d0c393b0.zip
GNU IceCat 3.5.2.
svn path=/nixpkgs/trunk/; revision=16618
-rw-r--r--pkgs/applications/networking/browsers/icecat-3/default.nix6
-rw-r--r--pkgs/applications/networking/browsers/icecat-3/pythonpath.patch14
2 files changed, 3 insertions, 17 deletions
diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix
index 9759a007de8..aa18c241a5a 100644
--- a/pkgs/applications/networking/browsers/icecat-3/default.nix
+++ b/pkgs/applications/networking/browsers/icecat-3/default.nix
@@ -4,13 +4,13 @@
 , freetype, fontconfig
 , application ? "browser" }:
 
-let version = "3.5.1"; in
+let version = "3.5.2"; in
 stdenv.mkDerivation {
   name = "icecat-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.bz2";
-    sha256 = "1g3grlar2i1vn3hnaql2ny210ghjyjp24d9j5jcdfx6nsx761030";
+    sha256 = "1hm11pghka8793shyf21ghky30ykbns952nbblki8dxkg84qsfpa";
   };
 
   buildInputs = [
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   ];
 
   patches = [
-    ./skip-gre-registration.patch ./rpath-link.patch ./pythonpath.patch
+    ./skip-gre-registration.patch ./rpath-link.patch
   ];
 
   configureFlags = [
diff --git a/pkgs/applications/networking/browsers/icecat-3/pythonpath.patch b/pkgs/applications/networking/browsers/icecat-3/pythonpath.patch
deleted file mode 100644
index c66800d57e5..00000000000
--- a/pkgs/applications/networking/browsers/icecat-3/pythonpath.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This patch makes sure $PYTHONPATH is not overridden so that the `ply'
-Python module is visible.
-
---- icecat-3.5.1/js/src/xpconnect/src/Makefile.in	2009-07-18 14:33:08.000000000 +0200
-+++ icecat-3.5.1/js/src/xpconnect/src/Makefile.in	2009-07-20 16:31:43.000000000 +0200
-@@ -209,7 +209,7 @@ dom_quickstubs.h dom_quickstubs.cpp: $(s
-                                      $(topsrcdir)/xpcom/idl-parser/header.py \
-                                      $(topsrcdir)/xpcom/idl-parser/xpidl.py \
-                                      $(DEPTH)/js/src/mozilla-config.h
--	PYTHONPATH=$(topsrcdir)/xpcom/idl-parser \
-+	PYTHONPATH="$$PYTHONPATH:$(topsrcdir)/xpcom/idl-parser" \
- 	  $(PYTHON) $(srcdir)/qsgen.py \
- 	  --idlpath=$(DEPTH)/dist/idl \
- 	  --cachedir=$(DEPTH)/xpcom/idl-parser \