Merge pull request #197955 from jtojnar/cairomm

cairomm_1_16: 1.16.1 → 1.16.2

pkgs/development/libraries/cairomm/1.16.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cairomm";
-  version = "1.16.1";
+  version = "1.16.2";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
-    url = "https://www.cairographics.org/releases/${pname}-${version}.tar.xz";
+    url = "https://www.cairographics.org/releases/cairomm-${version}.tar.xz";
-    sha256 = "sha256-b2Bg2OmN1Lis/uIpX92904z0h8B8JqrY0ag7ub/0osY=";
+    sha256 = "amO/mKl92isPVeNNG18/uQnvi3D5uNOCyx/zl459wT8=";
   };
 
   nativeBuildInputs = [

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";
+  version = "1.14.4";
-
-  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=";
-  };
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkg-config meson ninja ];
+  src = fetchurl {
-  propagatedBuildInputs = [ cairo libsigcxx ];
+    url = "https://www.cairographics.org/releases/cairomm-${version}.tar.xz";
-  buildInputs = [ fontconfig freetype ]
+    sha256 = "R0nSWisu9nzAwBTKr1yH+kZ5L8Sz7eGG+w/JMtIFUVg=";
-  ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+  };
+
+  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; {