diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-07-26 15:26:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-07-26 15:32:23 +0200 |
| commit | 28fce082c8ca1a8fb3dfac5c938829e51fb314c8 (patch) | |
| tree | d677e3ec334d46b78991b0fc3ea9f52562f85a45 | |
| parent | Merge pull request #93884 from zowoq/gobetween (diff) | |
| download | nixpkgs-28fce082c8ca1a8fb3dfac5c938829e51fb314c8.tar.gz | |
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
| -rw-r--r-- | pkgs/desktops/pantheon/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 13fd871b64f8..97f9fd12240b 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."; }) |