pantheon.wingpanel-indicator-sound: fix build with vala 0.54

This commit is contained in:
Bobby Rong 2021-10-23 11:13:49 +08:00
parent f71d3ea520
commit 4e1740b9de
No known key found for this signature in database
GPG key ID: ED07364437C91161

View file

@ -7,7 +7,7 @@
, meson
, python3
, ninja
, vala_0_52
, vala
, gtk3
, granite
, wingpanel
@ -36,23 +36,21 @@ stdenv.mkDerivation rec {
url = "https://github.com/elementary/wingpanel-indicator-sound/commit/df816104c15e4322c1077313b1f43114cdaf710e.patch";
sha256 = "029z7l467jz1ymxwrzrf874062r6xmskl7mldpq39jh110fijy5l";
})
# Fix build with vala 0.54
# https://github.com/elementary/wingpanel-indicator-sound/pull/221
(fetchpatch {
url = "https://github.com/elementary/wingpanel-indicator-sound/commit/398d181eabe3dd803dc0ba335ac629902ec5b5ab.patch";
sha256 = "1r2x3n6ws56jk7xcgk60am8mc5dgf8pz5ipsydxvmlrmipkjxyqi";
})
];
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
nativeBuildInputs = [
libxml2
meson
ninja
pkg-config
python3
# Does not build with vala 0.54
# https://github.com/elementary/wingpanel-indicator-sound/issues/219
vala_0_52
vala
];
buildInputs = [
@ -70,6 +68,12 @@ stdenv.mkDerivation rec {
patchShebangs meson/post_install.py
'';
passthru = {
updateScript = nix-update-script {
attrPath = "pantheon.${pname}";
};
};
meta = with lib; {
description = "Sound Indicator for Wingpanel";
homepage = "https://github.com/elementary/wingpanel-indicator-sound";