diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
| commit | 6dc839d3445e66b259361f08838a8c05b1912e68 (patch) | |
| tree | 5ef88f8fe4cb6f75cf0a1c1e821945c7186491c7 /pkgs/applications/networking/browsers/firefox/4.0.nix | |
| parent | 4309788df022c89765cd7f6b178f4ce7a08db600 (diff) | |
| parent | 327a2eae30b48277bd453842d03a144f618822b2 (diff) | |
| download | nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.gz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.bz2 nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.lz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.xz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.zst nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.zip | |
Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/4.0.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/4.0.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/4.0.nix b/pkgs/applications/networking/browsers/firefox/4.0.nix index 3a441193811a..af6224475555 100644 --- a/pkgs/applications/networking/browsers/firefox/4.0.nix +++ b/pkgs/applications/networking/browsers/firefox/4.0.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, libvpx, yasm, mesa +, libvpx, yasm, mesa, wirelesstools , # If you want the resulting program to call itself "Firefox" instead # of "Shiretoko" or whatever, enable this option. However, those @@ -52,6 +52,8 @@ rec { python dbus dbus_glib pango freetype fontconfig xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file alsaLib nspr /* nss */ libnotify xlibs.pixman libvpx yasm mesa + wirelesstools xlibs.libXscrnsaver xlibs.scrnsaverproto + xlibs.libXext xlibs.xextproto ]; configureFlags = @@ -105,7 +107,7 @@ rec { buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify - xlibs.pixman libvpx yasm mesa + xlibs.pixman libvpx yasm mesa wirelesstools ]; propagatedBuildInputs = [xulrunner]; |