From 5b6c5964b088997d9600dd8b4f21033aefb5f067 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 18 Dec 2017 18:16:57 +0000 Subject: [PATCH] Revert "cairo: bugfix 1.14.10 -> 1.14.12" This reverts commit fc5756ea5e4a73624e0cfbb0e3eef247fc312547. It hangs in cairo_image_surface_create_from_png_stream consuming 100% CPU when png is malformed: https://github.com/NixOS/nixpkgs/commit/fc5756ea5e4a73624e0cfbb0e3eef247fc312547 --- pkgs/development/libraries/cairo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 5487d889ce6..7c0e36d4068 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -12,11 +12,11 @@ assert glSupport -> mesa_noglu != null; let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - name = "cairo-1.14.12"; + name = "cairo-1.14.10"; src = fetchurl { url = "http://cairographics.org/releases/${name}.tar.xz"; - sha256 = "05mzyxkvsfc1annjw2dja8vka01ampp9pp93lg09j8hba06g144c"; + sha256 = "02banr0wxckq62nbhc3mqidfdh2q956i2r7w2hd9bjgjb238g1vy"; }; patches = [