JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pantheon: more build fixes by using older vala

Browse Source 
An extension of commit b49e798763.  /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
This commit is contained in:
Vladimír Čunát 2020-07-26 15:26:53 +02:00
parent dad2f74082
commit 28fce082c8
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/desktops/pantheon/default.nix
View File

@ -87,7 +87,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gala = callPackage ./desktop/gala { gala = callPackage ./desktop/gala {
inherit (gnome3) gnome-desktop; inherit (gnome3) gnome-desktop;
vala = pkgs.vala_0_46;
}; };
wingpanel = callPackage ./desktop/wingpanel { }; wingpanel = callPackage ./desktop/wingpanel { };
@ -199,12 +198,12 @@ lib.makeScope pkgs.newScope (self: with self; {
elementary-wallpapers = callPackage ./artwork/elementary-wallpapers { }; 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) { } // lib.optionalAttrs (config.allowAliases or true) {
### ALIASES ### ALIASES
inherit (pkgs) vala; # added 2019-10-10
cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1."; cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1.";
}) })