From dd832a3e8ffb5b7442e762139df688eacba4fbc8 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 7 Feb 2013 06:48:15 +0100 Subject: [PATCH] chromium: Update beta channel to v25.0.1364.68. This update is a bit more problematic, as the bundled version of libpng is version 1.2.45 and the version in nixpkgs is 1.5.13. Even if trying to run with libpng12 from nixpkgs, it seems to collide with parts of the bundled version. So, until this is either fixed upstream or we have a good solution, we're using bundled libpng for chromium version 25 and higher. Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/default.nix | 2 +- pkgs/applications/networking/browsers/chromium/sources.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index e32b31dc856..3aeaf41ad57 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -50,7 +50,7 @@ let use_system_libexpat = true; use_system_libexif = true; use_system_libjpeg = true; - use_system_libpng = true; + use_system_libpng = !post24; use_system_libusb = true; use_system_libxml = true; use_system_speex = true; diff --git a/pkgs/applications/networking/browsers/chromium/sources.nix b/pkgs/applications/networking/browsers/chromium/sources.nix index 99919d3f772..700aa9a4e00 100644 --- a/pkgs/applications/networking/browsers/chromium/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/sources.nix @@ -6,9 +6,9 @@ sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s"; }; beta = { - version = "25.0.1364.36"; - url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.36.tar.bz2"; - sha256 = "1pn7qv1s6lcx8k26h89x9zdy43rzdq12f92s2l6cfdhr9ls9wv0s"; + version = "25.0.1364.68"; + url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-25.0.1364.68.tar.bz2"; + sha256 = "0ps3dnpih2nxb0zkw251cfrls126ysnp818bjzcbl325cbypcgc9"; }; stable = { version = "24.0.1312.69";