diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-06-03 10:40:52 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-06-03 11:09:29 +0800 |
| commit | bde65d2eea592dc1860347e5df74127e262e7844 (patch) | |
| tree | e715ff33e5bf83c8d9375df80ca13f668d5fa13c /pkgs/applications/misc/tootle | |
| parent | 57b107c726ca4d0da44b703f0cb3be14149020f6 (diff) | |
tootle: pin to vala 0.54
Diffstat (limited to 'pkgs/applications/misc/tootle')
| -rw-r--r-- | pkgs/applications/misc/tootle/default.nix | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index c11ad8d1e981b..48b1b2d57e05e 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , nix-update-script , fetchpatch -, vala +, vala_0_54 , meson , ninja , pkg-config @@ -44,6 +44,12 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/community/tootle/0002-Use-reason_phrase-instead-of-get_phrase.patch?id=001bf1ce9695ddb0bbb58b44433d54207c15b0b5"; sha256 = "sha256-rm5NFLeAL2ilXpioywgCR9ppoq+MD0MLyVaBmdzVkqU="; }) + # Application: make app_entries private + # https://github.com/bleakgrey/tootle/pull/346 + (fetchpatch { + url = "https://git.alpinelinux.org/aports/plain/community/tootle/0003-make-app-entries-private.patch?id=c973e68e3cba855f1601ef010afa9a14578b9499"; + sha256 = "sha256-zwU0nxf/haBZl4tOYDmMzwug+HC6lLDT8/12Wt62+S4="; + }) ]; nativeBuildInputs = [ @@ -51,7 +57,11 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - vala + # Does not build with Vala 0.56.1: + # ../src/Widgets/Status.vala:8.43-8.56: error: construct + # properties not supported for specified property type + # public API.NotificationType? kind { get; construct set; } + vala_0_54 wrapGAppsHook ]; @@ -68,11 +78,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - # Fix build with vala 0.56 - # https://github.com/bleakgrey/tootle/pull/346 - substituteInPlace src/Application.vala \ - --replace "public const GLib.ActionEntry[] app_entries" "private const GLib.ActionEntry[] app_entries" - chmod +x meson/post_install.py patchShebangs meson/post_install.py ''; |