summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2014-03-17 22:30:51 +0100
committeraszlig <aszlig@redmoonstudios.org>2014-04-19 03:58:39 +0200
commit5b67290740fbb0d8b9a5bcc0d9a9108b844add5d (patch)
treea0978f769a64103f5e4561fb71fc8dc24c5828c1 /pkgs
parent823b72d0ad26d1bad0c6d5107a2dd8fc0c131995 (diff)
downloadnixpkgs-5b67290740fbb0d8b9a5bcc0d9a9108b844add5d.tar
nixpkgs-5b67290740fbb0d8b9a5bcc0d9a9108b844add5d.tar.gz
nixpkgs-5b67290740fbb0d8b9a5bcc0d9a9108b844add5d.tar.bz2
nixpkgs-5b67290740fbb0d8b9a5bcc0d9a9108b844add5d.tar.lz
nixpkgs-5b67290740fbb0d8b9a5bcc0d9a9108b844add5d.tar.xz
nixpkgs-5b67290740fbb0d8b9a5bcc0d9a9108b844add5d.tar.zst
nixpkgs-5b67290740fbb0d8b9a5bcc0d9a9108b844add5d.zip
chromium: Build using libpng from nixpkgs.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/browsers/chromium/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 8ef102c34cc..66fbe9779b9 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -116,7 +116,7 @@ let
     use_system_libexpat = true;
     use_system_libexif = true;
     use_system_libjpeg = true;
-    use_system_libpng = false; # PNG dlopen() version conflict
+    use_system_libpng = true;
     use_system_libwebp = true;
     use_system_libxml = true;
     use_system_opus = true;