diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-02-16 08:46:28 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-02-16 08:46:28 +0000 |
commit | a9efb9d155e66692c81ab475143f7e1473b36963 (patch) | |
tree | 39aa1d5c01e2e54953bde6cfdfd0810aa2904acc /pkgs/applications/networking/browsers/firefox | |
parent | bbda87fc306fdbdf22e8fe934505bbb90d420e46 (diff) | |
download | nixlib-a9efb9d155e66692c81ab475143f7e1473b36963.tar nixlib-a9efb9d155e66692c81ab475143f7e1473b36963.tar.gz nixlib-a9efb9d155e66692c81ab475143f7e1473b36963.tar.bz2 nixlib-a9efb9d155e66692c81ab475143f7e1473b36963.tar.lz nixlib-a9efb9d155e66692c81ab475143f7e1473b36963.tar.xz nixlib-a9efb9d155e66692c81ab475143f7e1473b36963.tar.zst nixlib-a9efb9d155e66692c81ab475143f7e1473b36963.zip |
* Firefox: don't use internal jpeg, png, zlib, cairo.
svn path=/nixpkgs/trunk/; revision=4819
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox')
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 5174717f0404..e4f8fb108cf0 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi +, libjpeg, libpng, zlib, cairo , # If you want the resulting program to call itself "Firefox" instead # of "Deer Park", enable this option. However, those binaries may @@ -17,7 +18,9 @@ stdenv.mkDerivation { md5 = "c76f02956645bc823241379e27f76bb5"; }; - buildInputs = [pkgconfig gtk perl zip libIDL libXi]; + buildInputs = [ + pkgconfig gtk perl zip libIDL libXi libjpeg libpng zlib cairo + ]; inherit gtk; patches = [./writable-copies.patch]; @@ -34,6 +37,7 @@ stdenv.mkDerivation { "--with-system-jpeg" "--with-system-png" "--with-system-zlib" + "--with-system-cairo" ] ++ (if enableOfficialBranding then ["--enable-official-branding"] else []); |