about summary refs log tree commit diff
path: root/pkgs/development/libraries/libgdata
diff options
context:
space:
mode:
authorChris Rendle-Short <chris@killred.net>2019-07-28 09:27:29 +1000
committerChris Rendle-Short <chris@killred.net>2019-07-28 10:46:30 +1000
commit9a2bddfc127a551d3d3a3ce7f8b7077899c8a69c (patch)
tree9536ac2ce58e6e94201cc0e915c4400e78d8a47d /pkgs/development/libraries/libgdata
parent30c81c8530f14a4ae57422b2f841fa16cd08e46d (diff)
libgdata: meson fixes
Diffstat (limited to 'pkgs/development/libraries/libgdata')
-rw-r--r--pkgs/development/libraries/libgdata/default.nix16
1 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix
index 77d4ed19b4eda..48cfa098c9fa5 100644
--- a/pkgs/development/libraries/libgdata/default.nix
+++ b/pkgs/development/libraries/libgdata/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchurl
+, fetchpatch
 , pkgconfig
 , meson
 , ninja
@@ -31,6 +32,21 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./installed-tests-path.patch
+    (fetchpatch {
+      # Meson fixes
+      url = "https://gitlab.gnome.org/GNOME/libgdata/commit/f6d0e3f3b6fa8e8ee9569372c5709c1fb84af2c1.diff";
+      sha256 = "00yrppn0s21i41r9mwzvrrv7j5dida09kh7i44kv8hrbrlfag7bm";
+    })
+    (fetchpatch {
+      # Meson minor fixes
+      url = "https://gitlab.gnome.org/GNOME/libgdata/commit/b653f602b3c2b518101c5d909e1651534c22757a.diff";
+      sha256 = "1bn0rffsvkzjl59aw8dmq1wil58x1fshz0m6xabpn79ffvbjld8j";
+    })
+    (fetchpatch {
+      # Meson: Fix G_LOG_DOMAIN
+      url = "https://gitlab.gnome.org/GNOME/libgdata/commit/5d318e0bf905d0f1a8b3fe1e47ee7847739082e3.diff";
+      sha256 = "11i2blq811d53433kdq4hhsscgkrq5f50d9ih4ixgs3j47hg7b1w";
+    })
   ];
 
   nativeBuildInputs = [