From 0e341a35e508515b98e59718f7ec5c71b0a692b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 2 Sep 2019 17:33:50 +0000
Subject: [PATCH] =?UTF-8?q?atk:=202.32.0=20=E2=86=92=202.34.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix .pc file requires gobject:
https://gitlab.gnome.org/GNOME/atk/merge_requests/30
---
 pkgs/development/libraries/atk/default.nix  | 10 ++++++++--
 pkgs/development/libraries/atk/fix_pc.patch |  9 +++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/atk/fix_pc.patch

diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index 0a076442b42c..9e80d4fc6ca6 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -4,7 +4,7 @@
 
 let
   pname = "atk";
-  version = "2.32.0";
+  version = "2.34.1";
 in
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1k4i817bd2w5b9z394f2yyx95591l2746wa40am0vvz4gzdgwhfb";
+    sha256 = "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l";
   };
 
   outputs = [ "out" "dev" ];
@@ -26,6 +26,12 @@ stdenv.mkDerivation rec {
     glib
   ];
 
+  patches = [
+    # meson builds an incorrect .pc file
+    # glib should be Requires not Requires.private
+    ./fix_pc.patch
+  ];
+
   doCheck = true;
 
   passthru = {
diff --git a/pkgs/development/libraries/atk/fix_pc.patch b/pkgs/development/libraries/atk/fix_pc.patch
new file mode 100644
index 000000000000..3d19d9862cbd
--- /dev/null
+++ b/pkgs/development/libraries/atk/fix_pc.patch
@@ -0,0 +1,9 @@
+--- a/atk/meson.build
++++ b/atk/meson.build
+@@ -162,5 +162,6 @@ pkgconfig.generate(libatk,
+   name: 'Atk',
+   description: 'Accessibility Toolkit',
+   subdirs: atk_api_name,
++  requires: glib_dep,
+   filebase: 'atk',
+ )