Skip to content

Commit

Permalink
pantheon: more build fixes by using older vala
Browse files Browse the repository at this point in the history
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
  • Loading branch information
vcunat committed Jul 26, 2020
1 parent dad2f74 commit 28fce08
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions pkgs/desktops/pantheon/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ lib.makeScope pkgs.newScope (self: with self; {

gala = callPackage ./desktop/gala {
inherit (gnome3) gnome-desktop;
vala = pkgs.vala_0_46;
};

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

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

vala = pkgs.vala_0_46; # multiple pantheon packages have issues with vala 0.48.7

} // lib.optionalAttrs (config.allowAliases or true) {

### ALIASES

inherit (pkgs) vala; # added 2019-10-10

cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1.";

})

0 comments on commit 28fce08

Please sign in to comment.