nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 16:03:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Firefox: don't use internal jpeg, png, zlib, cairo.

Browse Source 
svn path=/nixpkgs/trunk/; revision=4819
This commit is contained in:
Eelco Dolstra 2006-02-16 08:46:28 +00:00
parent bbda87fc30
commit a9efb9d155
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/browsers/firefox/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi { stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL, libXi
, libjpeg, libpng, zlib, cairo
, # If you want the resulting program to call itself "Firefox" instead , # If you want the resulting program to call itself "Firefox" instead
# of "Deer Park", enable this option. However, those binaries may # of "Deer Park", enable this option. However, those binaries may
@ -17,7 +18,9 @@ stdenv.mkDerivation {
md5 = "c76f02956645bc823241379e27f76bb5"; md5 = "c76f02956645bc823241379e27f76bb5";
}; };
buildInputs = [pkgconfig gtk perl zip libIDL libXi]; buildInputs = [
pkgconfig gtk perl zip libIDL libXi libjpeg libpng zlib cairo
];
inherit gtk; inherit gtk;
patches = [./writable-copies.patch]; patches = [./writable-copies.patch];
@ -34,6 +37,7 @@ stdenv.mkDerivation {
"--with-system-jpeg" "--with-system-jpeg"
"--with-system-png" "--with-system-png"
"--with-system-zlib" "--with-system-zlib"
"--with-system-cairo"
] ]
++ (if enableOfficialBranding then ["--enable-official-branding"] else []); ++ (if enableOfficialBranding then ["--enable-official-branding"] else []);

2
pkgs/system/all-packages-generic.nix
View File

@ -1836,7 +1836,7 @@ rec {
}; };
firefox = (import ../applications/networking/browsers/firefox) { firefox = (import ../applications/networking/browsers/firefox) {
inherit fetchurl stdenv pkgconfig perl zip; inherit fetchurl stdenv pkgconfig perl zip libjpeg libpng zlib cairo;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
inherit (gnome) libIDL; inherit (gnome) libIDL;
inherit (xlibs) libXi; inherit (xlibs) libXi;