public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aesop: 1.0.5 -> 1.0.7

Browse Source
This commit is contained in:
worldofpeace 2018-10-31 18:06:13 -04:00
parent 8bf705658a
commit c1e3f1c458
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/office/aesop/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, fetchFromGitHub, fetchpatch, vala, pkgconfig, meson, ninja, python3, granite, gtk3 { stdenv, fetchFromGitHub, fetchpatch, vala_0_40, pkgconfig, meson, ninja, python3, granite, gtk3
, gnome3, desktop-file-utils, json-glib, libsoup, poppler, gobjectIntrospection, wrapGAppsHook }: , gnome3, desktop-file-utils, json-glib, libsoup, poppler, gobjectIntrospection, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "aesop"; pname = "aesop";
version = "1.0.5"; version = "1.0.7";
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -21,11 +21,12 @@ stdenv.mkDerivation rec {
ninja ninja
pkgconfig pkgconfig
python3 python3
vala vala_0_40 # should be `elementary.vala` when elementary attribute set is merged
wrapGAppsHook wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
gnome3.defaultIconTheme # should be `elementary.defaultIconTheme`when elementary attribute set is merged
gnome3.libgee gnome3.libgee
granite granite
gtk3 gtk3
@ -34,14 +35,6 @@ stdenv.mkDerivation rec {
poppler poppler
]; ];
# Fix build with vala 0.42
patches = [
(fetchpatch {
url = "https://github.com/lainsce/aesop/commit/a90b3c711bd162583533370deb031c2c6254c82d.patch";
sha256 = "1zf831g6sqq3966q0i00x3jhlbfh9blcky6pnyp5qp59hxyxy169";
})
];
postPatch = '' postPatch = ''
chmod +x meson/post_install.py chmod +x meson/post_install.py
patchShebangs meson/post_install.py patchShebangs meson/post_install.py