From 28fce082c8ca1a8fb3dfac5c938829e51fb314c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 26 Jul 2020 15:26:53 +0200 Subject: [PATCH] pantheon: more build fixes by using older vala 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 --- pkgs/desktops/pantheon/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 13fd871b64f..97f9fd12240 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -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 { }; @@ -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."; })