diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2014-03-17 22:27:46 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2014-04-19 03:58:39 +0200 |
| commit | 823b72d0ad26d1bad0c6d5107a2dd8fc0c131995 (patch) | |
| tree | 24046239976006ddfa2f988d8e6164eba465932f /pkgs/applications | |
| parent | 7f47785d67b028a02b76aa3aec79b13366bd003d (diff) | |
| download | nixlib-823b72d0ad26d1bad0c6d5107a2dd8fc0c131995.tar nixlib-823b72d0ad26d1bad0c6d5107a2dd8fc0c131995.tar.gz nixlib-823b72d0ad26d1bad0c6d5107a2dd8fc0c131995.tar.bz2 nixlib-823b72d0ad26d1bad0c6d5107a2dd8fc0c131995.tar.lz nixlib-823b72d0ad26d1bad0c6d5107a2dd8fc0c131995.tar.xz nixlib-823b72d0ad26d1bad0c6d5107a2dd8fc0c131995.tar.zst nixlib-823b72d0ad26d1bad0c6d5107a2dd8fc0c131995.zip | |
chromium: Build with libwebp from nixpkgs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 292b99f92eb3..8ef102c34cc7 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -4,7 +4,7 @@ , bzip2, flac, speex, icu, libopus , libevent, expat, libjpeg, snappy , libpng, libxml2, libxslt, v8 -, xdg_utils, yasm, zlib +, xdg_utils, yasm, zlib, libwebp , libusb1, libexif, pciutils , python, pythonPackages, perl, pkgconfig @@ -117,6 +117,7 @@ let use_system_libexif = true; use_system_libjpeg = true; use_system_libpng = false; # PNG dlopen() version conflict + use_system_libwebp = true; use_system_libxml = true; use_system_opus = true; use_system_snappy = true; @@ -131,7 +132,6 @@ let use_system_harfbuzz = false; use_system_icu = false; # Doesn't support ICU 52 yet. use_system_libusb = false; # http://crbug.com/266149 - use_system_libwebp = false; # http://crbug.com/133161 use_system_skia = false; use_system_sqlite = false; # http://crbug.com/22208 use_system_v8 = !versionOlder src.version "34.0.0.0"; @@ -141,7 +141,7 @@ let bzip2 flac speex icu libopus libevent expat libjpeg snappy libpng libxml2 libxslt v8 - xdg_utils yasm zlib + xdg_utils yasm zlib libwebp libusb1 libexif ]; |