public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GNU IceCat 3.5.

Browse Source 
svn path=/nixpkgs/trunk/; revision=16352
This commit is contained in:
Ludovic Courtès 2009-07-14 12:59:04 +00:00
parent 62eccd21d4
commit 0bba7e6b84
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/browsers/icecat-3/default.nix
View File

@ -1,26 +1,26 @@
{ stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL { 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 , gnomevfs, libgnomeui
, freetype, fontconfig , freetype, fontconfig
, application ? "browser" }: , application ? "browser" }:
let version = "3.0.11-g1"; in let version = "3.5"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "icecat-${version}"; name = "icecat-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.bz2"; url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.bz2";
sha256 = "1kzsjlyi41lglsfnfsqdbs75b279pwi742cp19h6c2410gvsb9km"; sha256 = "1i2sc30j8zxq7p7wcsn7c5pcz4xny97vra13f2wbyzlky7hx6jkz";
}; };
buildInputs = [ buildInputs = [
libgnomeui gnomevfs libgnomeui gnomevfs alsaLib
pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
python dbus dbus_glib pango freetype fontconfig python dbus dbus_glib pango freetype fontconfig
xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt
]; ];
patches = [ ./skip-gre-registration.patch ]; patches = [ ./skip-gre-registration.patch ./rpath-link.patch ];
configureFlags = [ configureFlags = [
"--enable-application=${application}" "--enable-application=${application}"
@ -97,6 +97,8 @@ stdenv.mkDerivation {
homepage = http://www.gnu.org/software/gnuzilla/; homepage = http://www.gnu.org/software/gnuzilla/;
licenses = [ "GPLv2+" "LGPLv2+" "MPLv1+" ]; licenses = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
maintainers = [ stdenv.lib.maintainers.ludo ];
}; };
passthru = { passthru = {

14
pkgs/applications/networking/browsers/icecat-3/rpath-link.patch Normal file
View File

@ -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'

4
pkgs/top-level/all-packages.nix
View File

@ -6396,14 +6396,14 @@ let
icecat3 = lowPrio (import ../applications/networking/browsers/icecat-3 { icecat3 = lowPrio (import ../applications/networking/browsers/icecat-3 {
inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
python dbus dbus_glib freetype fontconfig bzip2 xlibs; python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib;
inherit (gnome) libIDL libgnomeui gnomevfs gtk pango; inherit (gnome) libIDL libgnomeui gnomevfs gtk pango;
}); });
icecatXulrunner3 = lowPrio (import ../applications/networking/browsers/icecat-3 { icecatXulrunner3 = lowPrio (import ../applications/networking/browsers/icecat-3 {
application = "xulrunner"; application = "xulrunner";
inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo
python dbus dbus_glib freetype fontconfig bzip2 xlibs; python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib;
inherit (gnome) libIDL libgnomeui gnomevfs gtk pango; inherit (gnome) libIDL libgnomeui gnomevfs gtk pango;
}); });