Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pantheon updates 2022-02-28 #162293

Merged
merged 2 commits into from
Mar 2, 2022
Merged

Pantheon updates 2022-02-28 #162293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bff904
pantheon.appcenter: fix AppStream.PoolFlags being renamed
bobby285271 Feb 25, 2022
4646e7f
pantheon.elementary-greeter: 6.0.1 -> 6.0.2
bobby285271 Mar 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions pkgs/desktops/pantheon/apps/appcenter/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
, desktop-file-utils
, elementary-icon-theme
, fetchFromGitHub
, fetchpatch
, flatpak
, gettext
, glib
Expand Down Expand Up @@ -38,6 +39,17 @@ stdenv.mkDerivation rec {
sha256 = "sha256-xktIHQHmz5gh72NEz9UQ9fMvBlj1BihWxHgxsHmTIB0=";
};

patches = [
# Fix AppStream.PoolFlags being renamed
# Though the API break has been fixed in latest appstream,
# let's use the non-deprecated version anyway.
# https://github.com/elementary/appcenter/pull/1794
(fetchpatch {
url = "https://github.com/elementary/appcenter/commit/84bc6400713484aa9365f0ba73f59c495da3f08b.patch";
sha256 = "sha256-HNRCJ/5mRbEVjCq9nrXtdQOOk1Jj5jalApkghD8ecpk=";
})
];

nativeBuildInputs = [
appstream-glib
dbus # for pkg-config
Expand Down
15 changes: 2 additions & 13 deletions pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, linkFarm
, substituteAll
Expand Down Expand Up @@ -31,13 +30,13 @@

stdenv.mkDerivation rec {
pname = "elementary-greeter";
version = "6.0.1";
version = "6.0.2";

src = fetchFromGitHub {
owner = "elementary";
repo = "greeter";
rev = version;
sha256 = "1f606ds56sp1c58q8dblfpaq9pwwkqw9i4gkwksw45m2xkwlbflq";
sha256 = "sha256-0chBM8JuCYgZXHneiSxSICZwBVm2Vgx+bas9wUjbnyg=";
};

patches = [
Expand All @@ -47,15 +46,6 @@ stdenv.mkDerivation rec {
src = ./hardcode-fallback-background.patch;
default_wallpaper = "${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}";
})
# https://github.com/NixOS/nixpkgs/issues/151609
# https://github.com/elementary/greeter/issues/578#issuecomment-1030746697
./fix-crash.patch
# Fix build with meson 0.61
# https://github.com/elementary/greeter/pull/590
(fetchpatch {
url = "https://github.com/elementary/greeter/commit/a4b25244058fce794a9f13f6b22a8ff7735ebde9.patch";
sha256 = "sha256-qPXhdvmYG8YMDU/CjbEkfZ0glgRzxnu0TsOPtvWHxLY=";
})
];

nativeBuildInputs = [
Expand All @@ -80,7 +70,6 @@ stdenv.mkDerivation rec {
libhandy
lightdm
mutter
wingpanel-with-indicators
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The greeter uses the panel as its own process for a while so I removed this from buildInputs but this still needs to stay in PATH.

];

mesonFlags = [
Expand Down
21 changes: 0 additions & 21 deletions pkgs/desktops/pantheon/desktop/elementary-greeter/fix-crash.patch
View file
Open in desktop

This file was deleted.