From 828985f2d72910cd8bef7c147328b49a1bb855f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 27 Jan 2010 08:53:31 +0000 Subject: [PATCH] GNU IceCat 3.6. svn path=/nixpkgs/trunk/; revision=19702 --- .../networking/browsers/icecat-3/default.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index 908b1eff225..23944bde79d 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/pkgs/applications/networking/browsers/icecat-3/default.nix @@ -1,19 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL +{ fetchurl, stdenv, xz, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib , gnomevfs, libgnomeui , freetype, fontconfig , application ? "browser" }: -let version = "3.5.7"; in +let version = "3.6"; in stdenv.mkDerivation { name = "icecat-${version}"; src = fetchurl { - url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.bz2"; - sha256 = "0pz48rz9rpig3xdvs6jkjc4azhwxabn81bz7c0alkfkdzjmcl8ym"; + url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.xz"; + sha256 = "149l00a9q3dnkdsc2spcfpx9fch4xhxnikbzgfiqxjsr3py07y41"; }; buildInputs = [ + xz libgnomeui gnomevfs alsaLib pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 python ply dbus dbus_glib pango freetype fontconfig diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f29a0edb602..dd66e6b92ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7136,7 +7136,7 @@ let }; icecat3 = lowPrio (import ../applications/networking/browsers/icecat-3 { - inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo + inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib; inherit (gnome) libIDL libgnomeui gnomevfs gtk pango; inherit (pythonPackages) ply;