summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2014-03-17 22:31:15 +0100
committeraszlig <aszlig@redmoonstudios.org>2014-04-19 03:58:40 +0200
commitc9c9ca38b94389851bc86b381038d919ffee1d2f (patch)
tree220d92cd2106caf79b3ad629d2ecaee81ed227d0 /pkgs
parent33acfbe9176cd0b88d3cb821a749de757e19ce58 (diff)
downloadnixlib-c9c9ca38b94389851bc86b381038d919ffee1d2f.tar
nixlib-c9c9ca38b94389851bc86b381038d919ffee1d2f.tar.gz
nixlib-c9c9ca38b94389851bc86b381038d919ffee1d2f.tar.bz2
nixlib-c9c9ca38b94389851bc86b381038d919ffee1d2f.tar.lz
nixlib-c9c9ca38b94389851bc86b381038d919ffee1d2f.tar.xz
nixlib-c9c9ca38b94389851bc86b381038d919ffee1d2f.tar.zst
nixlib-c9c9ca38b94389851bc86b381038d919ffee1d2f.zip
chromium: Build using minizip from nixpkgs.
Well, the gyp flag mentions "zlib" but in reality, minizip is used.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/browsers/chromium/default.nix6
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 66fbe9779b9f..dcd2f78a4f5e 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
   ];