Skip to content

Commit 28fce08

Browse files
committed
pantheon: more build fixes by using older vala
An extension of commit b49e798. /cc PR #92592. I expect it's "safer" when whole pantheon uses the same version. Fixes build of wingpanel-indicator-session; maybe some others, too. Now I built whole pantheon attrset and tests.pantheon.x86_64-linux
1 parent dad2f74 commit 28fce08

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

pkgs/desktops/pantheon/default.nix

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ lib.makeScope pkgs.newScope (self: with self; {
8787

8888
gala = callPackage ./desktop/gala {
8989
inherit (gnome3) gnome-desktop;
90-
vala = pkgs.vala_0_46;
9190
};
9291

9392
wingpanel = callPackage ./desktop/wingpanel { };
@@ -199,12 +198,12 @@ lib.makeScope pkgs.newScope (self: with self; {
199198

200199
elementary-wallpapers = callPackage ./artwork/elementary-wallpapers { };
201200

201+
vala = pkgs.vala_0_46; # multiple pantheon packages have issues with vala 0.48.7
202+
202203
} // lib.optionalAttrs (config.allowAliases or true) {
203204

204205
### ALIASES
205206

206-
inherit (pkgs) vala; # added 2019-10-10
207-
208207
cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1.";
209208

210209
})

0 commit comments

Comments
 (0)