diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-09-18 20:20:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-18 20:20:49 +0200 |
| commit | 747450ef4927078376984947be2a2679699faa5b (patch) | |
| tree | 9d8cf1e21f3eb833048c0709869b720177b2f8cf | |
| parent | a83d61b70864e7b539e129faa8842113b5a55716 (diff) | |
| parent | 91fe7f544777473059f6fdf318a28d78b52e017a (diff) | |
| download | nixlib-747450ef4927078376984947be2a2679699faa5b.tar nixlib-747450ef4927078376984947be2a2679699faa5b.tar.gz nixlib-747450ef4927078376984947be2a2679699faa5b.tar.bz2 nixlib-747450ef4927078376984947be2a2679699faa5b.tar.lz nixlib-747450ef4927078376984947be2a2679699faa5b.tar.xz nixlib-747450ef4927078376984947be2a2679699faa5b.tar.zst nixlib-747450ef4927078376984947be2a2679699faa5b.zip | |
Merge pull request #46848 from worldofpeace/aesop/fix-build
aesop: fix build with vala_42
| -rw-r--r-- | pkgs/applications/office/aesop/default.nix | 12 |
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 |