From c9c9ca38b94389851bc86b381038d919ffee1d2f Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 17 Mar 2014 22:31:15 +0100 Subject: [PATCH] chromium: Build using minizip from nixpkgs. Well, the gyp flag mentions "zlib" but in reality, minizip is used. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 66fbe9779b9..dcd2f78a4f5 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, libwebp +, xdg_utils, yasm, minizip, libwebp , libusb1, libexif, pciutils , python, pythonPackages, perl, pkgconfig @@ -126,7 +126,7 @@ let use_system_stlport = true; use_system_xdg_utils = true; use_system_yasm = true; - use_system_zlib = false; # http://crbug.com/143623 + use_system_zlib = true; use_system_protobuf = true; use_system_harfbuzz = false; @@ -141,7 +141,7 @@ let bzip2 flac speex icu libopus libevent expat libjpeg snappy libpng libxml2 libxslt v8 - xdg_utils yasm zlib libwebp + xdg_utils yasm minizip libwebp libusb1 libexif ];