From ddbe9a1a1e1ed1596de6555843787d7c12d092d5 Mon Sep 17 00:00:00 2001 From: misilelaboratory Date: Fri, 14 Mar 2025 19:13:37 +0900 Subject: [PATCH] cairo: 1.18.2 -> 1.18.4 https://www.cairographics.org/news/cairo-1.18.4 Signed-off-by: misilelaboratory --- pkgs/by-name/ca/cairo/package.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ca/cairo/package.nix b/pkgs/by-name/ca/cairo/package.nix index 1d96951ac59c..5fc6bd6f0319 100644 --- a/pkgs/by-name/ca/cairo/package.nix +++ b/pkgs/by-name/ca/cairo/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchurl, - fetchpatch, + lzo, gtk-doc, meson, ninja, @@ -34,13 +34,13 @@ stdenv.mkDerivation ( in { pname = "cairo"; - version = "1.18.2"; + version = "1.18.4"; src = fetchurl { url = "https://cairographics.org/${ if lib.mod (builtins.fromJSON (lib.versions.minor version)) 2 == 0 then "releases" else "snapshots" }/${pname}-${version}.tar.xz"; - hash = "sha256-piubtCQl6ETMPW3d4EP/Odur7dFULrpXout5+FiJ1Fo="; + hash = "sha256-RF7YIIpuSCPeEianTKMZ02AOg/Y2n5mxQmUAZZnDLMs="; }; outputs = [ @@ -61,16 +61,7 @@ stdenv.mkDerivation ( buildInputs = [ docbook_xsl - ]; - - patches = [ - # Pull upstream fix to fix "out of memory" errors: - # https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/595 - (fetchpatch { - name = "fix-oom.patch"; - url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/b9eed915f9a67380e7ef9d8746656455c43f67e2.patch"; - hash = "sha256-iWYxMVeNpseClSTf7BfU9GBe+tJWc+DUJWTWE5MnGh4="; - }) + lzo ]; propagatedBuildInputs =