firefox 22: use system libpng
This commit is contained in:
parent
f7b3032da7
commit
d51c01ac8e
|
@ -46,7 +46,7 @@ in rec {
|
||||||
"--with-system-nss"
|
"--with-system-nss"
|
||||||
"--with-system-libevent"
|
"--with-system-libevent"
|
||||||
"--with-system-libvpx"
|
"--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-startup-notification"
|
||||||
"--enable-system-ffi"
|
"--enable-system-ffi"
|
||||||
"--enable-system-hunspell"
|
"--enable-system-hunspell"
|
||||||
|
@ -66,7 +66,7 @@ in rec {
|
||||||
inherit src;
|
inherit src;
|
||||||
|
|
||||||
buildInputs =
|
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
|
python dbus dbus_glib pango freetype fontconfig xlibs.libXi
|
||||||
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
|
xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
|
||||||
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
|
alsaLib nspr nss libnotify xlibs.pixman yasm mesa
|
||||||
|
@ -82,7 +82,7 @@ in rec {
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
patches = optional useSystemCairo ./system-cairo.patch; # probably in 22
|
patches = optional useSystemCairo ./system-cairo.patch;
|
||||||
|
|
||||||
preConfigure =
|
preConfigure =
|
||||||
''
|
''
|
||||||
|
@ -136,7 +136,7 @@ in rec {
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
buildInputs =
|
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
|
dbus dbus_glib pango freetype fontconfig alsaLib nspr nss libnotify
|
||||||
xlibs.pixman yasm mesa sqlite file unzip pysqlite
|
xlibs.pixman yasm mesa sqlite file unzip pysqlite
|
||||||
hunspell libevent libstartup_notification libvpx
|
hunspell libevent libstartup_notification libvpx
|
||||||
|
|
|
@ -7390,6 +7390,7 @@ let
|
||||||
firefoxPkgs = callPackage ../applications/networking/browsers/firefox {
|
firefoxPkgs = callPackage ../applications/networking/browsers/firefox {
|
||||||
inherit (gnome) libIDL;
|
inherit (gnome) libIDL;
|
||||||
inherit (pythonPackages) pysqlite;
|
inherit (pythonPackages) pysqlite;
|
||||||
|
libpng = libpng.override { apngSupport = true; };
|
||||||
};
|
};
|
||||||
|
|
||||||
firefoxWrapper = lowPrio (wrapFirefox { browser = firefoxPkgs.firefox; });
|
firefoxWrapper = lowPrio (wrapFirefox { browser = firefoxPkgs.firefox; });
|
||||||
|
|
Loading…
Reference in a new issue