diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2009-07-14 12:59:04 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2009-07-14 12:59:04 +0000 |
| commit | 0bba7e6b84aca9d91472f9857504d9a8ccef2003 (patch) | |
| tree | e4a44d6ec81594e441845640d4d532178f9a7128 /pkgs/applications/networking | |
| parent | 62eccd21d4408ce8ec68c7b91d0b669a813b357a (diff) | |
| download | nixlib-0bba7e6b84aca9d91472f9857504d9a8ccef2003.tar nixlib-0bba7e6b84aca9d91472f9857504d9a8ccef2003.tar.gz nixlib-0bba7e6b84aca9d91472f9857504d9a8ccef2003.tar.bz2 nixlib-0bba7e6b84aca9d91472f9857504d9a8ccef2003.tar.lz nixlib-0bba7e6b84aca9d91472f9857504d9a8ccef2003.tar.xz nixlib-0bba7e6b84aca9d91472f9857504d9a8ccef2003.tar.zst nixlib-0bba7e6b84aca9d91472f9857504d9a8ccef2003.zip | |
GNU IceCat 3.5.
svn path=/nixpkgs/trunk/; revision=16352
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/browsers/icecat-3/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/icecat-3/rpath-link.patch | 14 |
2 files changed, 21 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index 07c27ec1a973..2d78fba58f05 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/pkgs/applications/networking/browsers/icecat-3/default.nix @@ -1,26 +1,26 @@ { stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs +, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib , gnomevfs, libgnomeui , freetype, fontconfig , application ? "browser" }: -let version = "3.0.11-g1"; in +let version = "3.5"; in stdenv.mkDerivation { name = "icecat-${version}"; src = fetchurl { url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.bz2"; - sha256 = "1kzsjlyi41lglsfnfsqdbs75b279pwi742cp19h6c2410gvsb9km"; + sha256 = "1i2sc30j8zxq7p7wcsn7c5pcz4xny97vra13f2wbyzlky7hx6jkz"; }; buildInputs = [ - libgnomeui gnomevfs + libgnomeui gnomevfs alsaLib pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 python dbus dbus_glib pango freetype fontconfig xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt ]; - patches = [ ./skip-gre-registration.patch ]; + patches = [ ./skip-gre-registration.patch ./rpath-link.patch ]; configureFlags = [ "--enable-application=${application}" @@ -97,6 +97,8 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/gnuzilla/; licenses = [ "GPLv2+" "LGPLv2+" "MPLv1+" ]; + + maintainers = [ stdenv.lib.maintainers.ludo ]; }; passthru = { diff --git a/pkgs/applications/networking/browsers/icecat-3/rpath-link.patch b/pkgs/applications/networking/browsers/icecat-3/rpath-link.patch new file mode 100644 index 000000000000..d50784f13eea --- /dev/null +++ b/pkgs/applications/networking/browsers/icecat-3/rpath-link.patch @@ -0,0 +1,14 @@ +Without this patch, IceCat ends up linking with +`-Wl,-rpath-link=/bin -Wl-,-rpath-link=/lib'. + +--- icecat-3.5/js/src/configure 2009-07-04 18:03:01.000000000 +0200 ++++ icecat-3.5/js/src/configure 2009-07-13 18:34:30.000000000 +0200 +@@ -4775,7 +4775,6 @@ HOST_AR='$(AR)' + HOST_AR_FLAGS='$(AR_FLAGS)' + + MOZ_JS_LIBS='-L$(libdir) -lmozjs' +-MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib' + + MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)' + MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat' + |