From 91fe7f544777473059f6fdf318a28d78b52e017a Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 18 Sep 2018 13:51:14 -0400 Subject: aesop: fix build with vala_42 --- pkgs/applications/office/aesop/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/office') 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 -- cgit 1.4.1