From f9eaa902c0aedf01d476aa7eb2c040c9f9b99387 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 4 May 2022 13:14:34 +0000
Subject: [PATCH] =?UTF-8?q?atk:=202.36.0=20=E2=86=92=202.38.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/atk/-/compare/ATK_2_36_0...2.38.0

Also clean up the expression to match the rest of the GNOME package set.
---
 pkgs/development/libraries/atk/default.nix | 55 +++++++++++++---------
 1 file changed, 34 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index 08e6e5b0e41..ce3352b5751 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -1,29 +1,26 @@
-{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib
-, fixDarwinDylibNames, gobject-introspection, gnome
+{ stdenv
+, lib
+, fetchurl
+, meson
+, ninja
+, gettext
+, pkg-config
+, glib
+, fixDarwinDylibNames
+, gobject-introspection
+, gnome
 }:
 
-let
-  pname = "atk";
-  version = "2.36.0";
-in
-
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1217cmmykjgkkim0zr1lv5j13733m4w5vipmy4ivw0ll6rz28xpv";
-  };
+  pname = "atk";
+  version = "2.38.0";
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ meson ninja pkg-config gettext gobject-introspection glib ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
-
-  propagatedBuildInputs = [
-    # Required by atk.pc
-    glib
-  ];
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "rE3ipO9L1WZQUpUv4WllfmXolcUFff+zwqgQ9hkaDDY=";
+  };
 
   patches = [
     # meson builds an incorrect .pc file
@@ -31,6 +28,22 @@ stdenv.mkDerivation rec {
     ./fix_pc.patch
   ];
 
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    gettext
+    gobject-introspection
+    glib
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    fixDarwinDylibNames
+  ];
+
+  propagatedBuildInputs = [
+    # Required by atk.pc
+    glib
+  ];
+
   mesonFlags = [
     "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}"
   ];
@@ -55,7 +68,7 @@ stdenv.mkDerivation rec {
       control running applications.
     '';
 
-    homepage = "http://library.gnome.org/devel/atk/";
+    homepage = "https://gitlab.gnome.org/GNOME/atk";
 
     license = lib.licenses.lgpl2Plus;