From 0a76ece12cbf67290379cb110842189d75bac80a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 26 Oct 2022 20:26:03 +0200
Subject: [PATCH] =?UTF-8?q?cairomm:=201.14.3=20=E2=86=92=201.14.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.freedesktop.org/cairo/cairomm/-/compare/1.14.3...1.14.4

Also format the expression.
---
 .../development/libraries/cairomm/default.nix | 46 +++++++++++++------
 1 file changed, 33 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix
index 384b1b0e7cb1..9a5ebfb289ea 100644
--- a/pkgs/development/libraries/cairomm/default.nix
+++ b/pkgs/development/libraries/cairomm/default.nix
@@ -1,25 +1,45 @@
-{ fetchurl, lib, stdenv, pkg-config, darwin, cairo, fontconfig, freetype, libsigcxx, meson, ninja }:
+{ fetchurl
+, stdenv
+, lib
+, pkg-config
+, darwin
+, cairo
+, fontconfig
+, freetype
+, libsigcxx
+, meson
+, ninja
+}:
 
 stdenv.mkDerivation rec {
   pname = "cairomm";
-  version = "1.14.3";
-
-  src = fetchurl {
-    url = "https://www.cairographics.org/releases/${pname}-${version}.tar.xz";
-    # gnome doesn't have the latest version ATM; beware: same name but different hash
-    #url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-DTfgZ8XEyngIt87dq/4ZMsW9KnUK1k+zIeEhNTYpfng=";
-  };
+  version = "1.14.4";
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkg-config meson ninja ];
-  propagatedBuildInputs = [ cairo libsigcxx ];
-  buildInputs = [ fontconfig freetype ]
-  ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+  src = fetchurl {
+    url = "https://www.cairographics.org/releases/cairomm-${version}.tar.xz";
+    sha256 = "R0nSWisu9nzAwBTKr1yH+kZ5L8Sz7eGG+w/JMtIFUVg=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    fontconfig
+    freetype
+  ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     ApplicationServices
   ]);
 
+  propagatedBuildInputs = [
+    cairo
+    libsigcxx
+  ];
+
   doCheck = true;
 
   meta = with lib; {