tootle: pin to vala 0.54
This commit is contained in:
parent
57b107c726
commit
bde65d2eea
1 changed files with 12 additions and 7 deletions
|
@ -3,7 +3,7 @@
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, nix-update-script
|
, nix-update-script
|
||||||
, fetchpatch
|
, fetchpatch
|
||||||
, vala
|
, vala_0_54
|
||||||
, meson
|
, meson
|
||||||
, ninja
|
, ninja
|
||||||
, pkg-config
|
, 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";
|
url = "https://git.alpinelinux.org/aports/plain/community/tootle/0002-Use-reason_phrase-instead-of-get_phrase.patch?id=001bf1ce9695ddb0bbb58b44433d54207c15b0b5";
|
||||||
sha256 = "sha256-rm5NFLeAL2ilXpioywgCR9ppoq+MD0MLyVaBmdzVkqU=";
|
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 = [
|
nativeBuildInputs = [
|
||||||
|
@ -51,7 +57,11 @@ stdenv.mkDerivation rec {
|
||||||
ninja
|
ninja
|
||||||
pkg-config
|
pkg-config
|
||||||
python3
|
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
|
wrapGAppsHook
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -68,11 +78,6 @@ stdenv.mkDerivation rec {
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
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
|
chmod +x meson/post_install.py
|
||||||
patchShebangs meson/post_install.py
|
patchShebangs meson/post_install.py
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Reference in a new issue