diff options
author | Ludovic Courtès <ludo@gnu.org> | 2010-02-01 09:16:56 +0000 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2010-02-01 09:16:56 +0000 |
commit | d5219beafc627bb0d5db59115a06310af895cc9c (patch) | |
tree | 0214ee728c1f5a866e56fcd534071c30526df828 /pkgs/applications/networking | |
parent | 1664ec986aa0faaf13de39efb22f9ec56aebbd2c (diff) |
GNU IceCat 3.6: Disable WiFi stuff for now.
svn path=/nixpkgs/trunk/; revision=19744
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/browsers/icecat-3/default.nix | 59 |
1 files changed, 32 insertions, 27 deletions
diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index 66c1a67a39a1..4335c63c7c7a 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/pkgs/applications/networking/browsers/icecat-3/default.nix @@ -1,9 +1,14 @@ { fetchurl, stdenv, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib , libnotify, gnomevfs, libgnomeui -, freetype, fontconfig +, freetype, fontconfig, wirelesstools ? null , 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 stdenv.mkDerivation { name = "icecat-${version}"; @@ -13,35 +18,35 @@ stdenv.mkDerivation { sha256 = "0fsf8zd8nncg1w1gg2jhlxwkbljvrx4mm9pywasklyi0gvi939ds"; }; - buildInputs = [ - libgnomeui libnotify gnomevfs alsaLib - pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 - python ply dbus dbus_glib pango freetype fontconfig - xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt - ]; + buildInputs = + [ libgnomeui libnotify gnomevfs alsaLib + pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 + python ply dbus dbus_glib pango freetype fontconfig + xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt + ] + ++ (stdenv.lib.optional false /* stdenv.isLinux */ wirelesstools); patches = [ ./skip-gre-registration.patch ./rpath-link.patch ]; - configureFlags = [ - "--enable-application=${application}" - "--enable-libxul" - "--disable-javaxpcom" - - "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" - #"--enable-system-sqlite" # <-- this seems to be discouraged - "--disable-crashreporter" - ]; - - preConfigure = ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC"''; + configureFlags = + [ "--enable-application=${application}" + "--enable-libxul" + "--disable-javaxpcom" + + "--enable-optimize" + "--disable-debug" + "--enable-strip" + "--with-system-jpeg" + "--with-system-zlib" + "--with-system-bz2" + # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" + "--enable-system-cairo" + #"--enable-system-sqlite" # <-- this seems to be discouraged + "--disable-crashreporter" + ] + ++ (stdenv.lib.optional true /* (!stdenv.isLinux) */ "--disable-necko-wifi"); postInstall = '' export dontPatchELF=1; @@ -79,8 +84,8 @@ stdenv.mkDerivation { fi # Put the GNU IceCat icon in the right place. - ensureDir $out/lib/$libDir/chrome/icons/default - ln -s ../../../icons/default.xpm $out/lib/$libDir/chrome/icons/default/ + ensureDir "$out/lib/$libDir/chrome/icons/default" + ln -s ../../../icons/default.xpm "$out/lib/$libDir/chrome/icons/default/" ''; meta = { |