summary refs log tree commit diff
path: root/pkgs/applications/office
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@users.noreply.github.com>2018-09-18 13:51:14 -0400
committerworldofpeace <worldofpeace@users.noreply.github.com>2018-09-18 13:51:14 -0400
commit91fe7f544777473059f6fdf318a28d78b52e017a (patch)
tree581080b3718ab6f6582b443cba1dfd4ae2e46317 /pkgs/applications/office
parentbc1911e96e0705cd54983b6555ca25c55a66ded6 (diff)
downloadnixlib-91fe7f544777473059f6fdf318a28d78b52e017a.tar
nixlib-91fe7f544777473059f6fdf318a28d78b52e017a.tar.gz
nixlib-91fe7f544777473059f6fdf318a28d78b52e017a.tar.bz2
nixlib-91fe7f544777473059f6fdf318a28d78b52e017a.tar.lz
nixlib-91fe7f544777473059f6fdf318a28d78b52e017a.tar.xz
nixlib-91fe7f544777473059f6fdf318a28d78b52e017a.tar.zst
nixlib-91fe7f544777473059f6fdf318a28d78b52e017a.zip
aesop: fix build with vala_42
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r--pkgs/applications/office/aesop/default.nix12
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix
index cf816a281221..64e2c0b94679 100644
--- a/pkgs/applications/office/aesop/default.nix
+++ b/pkgs/applications/office/aesop/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, vala, pkgconfig, meson, ninja, python3, granite, gtk3, gnome3
-, desktop-file-utils, json-glib, libsoup, poppler, gobjectIntrospection, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, fetchpatch, vala, pkgconfig, meson, ninja, python3, granite, gtk3
+, gnome3, desktop-file-utils, json-glib, libsoup, poppler, gobjectIntrospection, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   pname = "aesop";
@@ -34,6 +34,14 @@ stdenv.mkDerivation rec {
     poppler
   ];
 
+  # Fix build with vala 0.42
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/lainsce/aesop/commit/a90b3c711bd162583533370deb031c2c6254c82d.patch";
+      sha256 = "1zf831g6sqq3966q0i00x3jhlbfh9blcky6pnyp5qp59hxyxy169";
+    })
+  ];
+
   postPatch = ''
     chmod +x meson/post_install.py
     patchShebangs meson/post_install.py