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

GNU IceCat 3.6: Disable WiFi stuff for now. 

svn path=/nixpkgs/trunk/; revision=19744
This commit is contained in:
Ludovic Courtès 2010-02-01 09:16:56 +00:00
parent 1664ec986a
commit d5219beafc
2 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,14 @@
{ fetchurl, stdenv, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL { fetchurl, stdenv, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib
, libnotify, gnomevfs, libgnomeui , libnotify, gnomevfs, libgnomeui
, freetype, fontconfig , freetype, fontconfig, wirelesstools ? null
, application ? "browser" }: , application ? "browser" }:
# Build the WiFi stuff on Linux-based systems.
# FIXME: Disable for now until it can actually be built:
# http://thread.gmane.org/gmane.comp.gnu.gnuzilla/1376 .
#assert stdenv.isLinux -> (wirelesstools != null);
let version = "3.6"; in let version = "3.6"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "icecat-${version}"; name = "icecat-${version}";
@ -13,35 +18,35 @@ stdenv.mkDerivation {
sha256 = "0fsf8zd8nncg1w1gg2jhlxwkbljvrx4mm9pywasklyi0gvi939ds"; sha256 = "0fsf8zd8nncg1w1gg2jhlxwkbljvrx4mm9pywasklyi0gvi939ds";
}; };
buildInputs = [ buildInputs =
libgnomeui libnotify gnomevfs alsaLib [ libgnomeui libnotify gnomevfs alsaLib
pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
python ply dbus dbus_glib pango freetype fontconfig python ply 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
]; ]
++ (stdenv.lib.optional false /* stdenv.isLinux */ wirelesstools);
patches = [ patches = [
./skip-gre-registration.patch ./rpath-link.patch ./skip-gre-registration.patch ./rpath-link.patch
]; ];
configureFlags = [ configureFlags =
"--enable-application=${application}" [ "--enable-application=${application}"
"--enable-libxul" "--enable-libxul"
"--disable-javaxpcom" "--disable-javaxpcom"
"--enable-optimize" "--enable-optimize"
"--disable-debug" "--disable-debug"
"--enable-strip" "--enable-strip"
"--with-system-jpeg" "--with-system-jpeg"
"--with-system-zlib" "--with-system-zlib"
"--with-system-bz2" "--with-system-bz2"
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
"--enable-system-cairo" "--enable-system-cairo"
#"--enable-system-sqlite" # <-- this seems to be discouraged #"--enable-system-sqlite" # <-- this seems to be discouraged
"--disable-crashreporter" "--disable-crashreporter"
]; ]
++ (stdenv.lib.optional true /* (!stdenv.isLinux) */ "--disable-necko-wifi");
preConfigure = ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC"'';
postInstall = '' postInstall = ''
export dontPatchELF=1; export dontPatchELF=1;
@ -79,8 +84,8 @@ stdenv.mkDerivation {
fi fi
# Put the GNU IceCat icon in the right place. # Put the GNU IceCat icon in the right place.
ensureDir $out/lib/$libDir/chrome/icons/default ensureDir "$out/lib/$libDir/chrome/icons/default"
ln -s ../../../icons/default.xpm $out/lib/$libDir/chrome/icons/default/ ln -s ../../../icons/default.xpm "$out/lib/$libDir/chrome/icons/default/"
''; '';
meta = { meta = {

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

@ -7150,7 +7150,8 @@ 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 alsaLib libnotify; python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify
wirelesstools;
inherit (gnome) libIDL libgnomeui gnomevfs gtk pango; inherit (gnome) libIDL libgnomeui gnomevfs gtk pango;
inherit (pythonPackages) ply; inherit (pythonPackages) ply;
}); });
@ -7158,7 +7159,8 @@ let
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 alsaLib libnotify; python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify
wirelesstools;
inherit (gnome) libIDL libgnomeui gnomevfs gtk pango; inherit (gnome) libIDL libgnomeui gnomevfs gtk pango;
inherit (pythonPackages) ply; inherit (pythonPackages) ply;
}); });