nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-10-31 22:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

firefox 22: use system libpng

Browse Source
This commit is contained in:
Mathijs Kwik 2013-06-27 09:22:40 +02:00
parent f7b3032da7
commit d51c01ac8e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@ in rec {
"--with-system-nss"
"--with-system-libevent"
"--with-system-libvpx"
# "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
"--with-system-png"
"--enable-startup-notification"
"--enable-system-ffi"
"--enable-system-hunspell"
@ -66,7 +66,7 @@ in rec {
inherit src;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg libpng zlib bzip2
[ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
@ -82,7 +82,7 @@ in rec {
enableParallelBuilding = true;
patches = optional useSystemCairo ./system-cairo.patch; # probably in 22
patches = optional useSystemCairo ./system-cairo.patch;
preConfigure =
''
@ -136,7 +136,7 @@ in rec {
enableParallelBuilding = true;
buildInputs =
[ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 python
[ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2 python
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
xlibs.pixman yasm mesa sqlite file unzip pysqlite
hunspell libevent libstartup_notification libvpx

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

@ -7390,6 +7390,7 @@ let
firefoxPkgs = callPackage ../applications/networking/browsers/firefox {
inherit (gnome) libIDL;
inherit (pythonPackages) pysqlite;
libpng = libpng.override { apngSupport = true; };
};
firefoxWrapper = lowPrio (wrapFirefox { browser = firefoxPkgs.firefox; });