Merge pull request #174714 from NixOS/pantheon-stable
Pantheon 7 updates 2022-05-26
This commit is contained in:
commit
cce0667703
|
@ -2,13 +2,9 @@
|
|||
, stdenv
|
||||
, nix-update-script
|
||||
, appstream
|
||||
, appstream-glib
|
||||
, dbus
|
||||
, desktop-file-utils
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, flatpak
|
||||
, gettext
|
||||
, glib
|
||||
, granite
|
||||
, gtk3
|
||||
|
@ -29,31 +25,17 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "appcenter";
|
||||
version = "3.9.1";
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-xktIHQHmz5gh72NEz9UQ9fMvBlj1BihWxHgxsHmTIB0=";
|
||||
sha256 = "sha256-Y3ueicw6Hn6lw24hdPeJohGol6l7UlQFIefYsBVY6Hg=";
|
||||
};
|
||||
|
||||
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
|
||||
desktop-file-utils
|
||||
gettext
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
, libXfixes
|
||||
, libXi
|
||||
, pango
|
||||
, gettext
|
||||
, pkg-config
|
||||
, libxml2
|
||||
, bamf
|
||||
|
@ -28,19 +27,18 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-dock";
|
||||
version = "unstable-2021-12-08";
|
||||
version = "unstable-2021-05-07";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "dock";
|
||||
rev = "5e4b5ba2eec3b522e107ad834a59c0f1271d4699";
|
||||
sha256 = "sha256-/Ul21t9VFxhmlQbfx4eY86UKU33hiRfXF9OPHBzPe5o=";
|
||||
rev = "113c3b0bc7744501d2101dd7afc1ef21ba66b326";
|
||||
sha256 = "sha256-YlvdB02/hUGaDyHIHy21bgloHyVy3vHcanyNKnp3YbM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
meson
|
||||
ninja
|
||||
libxml2 # xmllint
|
||||
|
|
|
@ -1,66 +1,50 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, nix-update-script
|
||||
, substituteAll
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
, vala
|
||||
, pkg-config
|
||||
, python3
|
||||
, gtk3
|
||||
, glib
|
||||
, granite
|
||||
, libgee
|
||||
, elementary-settings-daemon
|
||||
, gettext
|
||||
, libhandy
|
||||
, wrapGAppsHook
|
||||
, vala
|
||||
, wrapGAppsHook4
|
||||
, appcenter
|
||||
, elementary-settings-daemon
|
||||
, glib
|
||||
, granite7
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, libgee
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-onboarding";
|
||||
version = "6.1.0";
|
||||
version = "7.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "onboarding";
|
||||
rev = version;
|
||||
sha256 = "sha256-9voy9eje3VlV4IMM664EyjKWTfSVogX5JoRCqhsUXTE=";
|
||||
sha256 = "sha256-bxOy9VivpgL4xXJhDF7K/gpq9zcCFIJFfRpG7QC8svE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
appcenter = appcenter;
|
||||
})
|
||||
# Provides the directory where the locales are actually installed
|
||||
# https://github.com/elementary/onboarding/pull/147
|
||||
(fetchpatch {
|
||||
url = "https://github.com/elementary/onboarding/commit/af19c3dbefd1c0e0ec18eddacc1f21cb991f5513.patch";
|
||||
sha256 = "sha256-fSFfjSd33W7rXXEUHY8b3rv9B9c31XfCjxjRxBBrqjs=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
python3
|
||||
vala
|
||||
wrapGAppsHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
appcenter # settings schema
|
||||
elementary-settings-daemon # settings schema
|
||||
glib
|
||||
granite
|
||||
gtk3
|
||||
granite7
|
||||
gtk4
|
||||
libadwaita
|
||||
libgee
|
||||
libhandy
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/Views/AppCenterView.vala b/src/Views/AppCenterView.vala
|
||||
index 16cd18b..5895897 100644
|
||||
--- a/src/Views/AppCenterView.vala
|
||||
+++ b/src/Views/AppCenterView.vala
|
||||
@@ -55,7 +55,7 @@ public class Onboarding.AppCenterView : AbstractOnboardingView {
|
||||
appcenter_button.clicked.connect (() => {
|
||||
try {
|
||||
var appcenter = AppInfo.create_from_commandline (
|
||||
- "io.elementary.appcenter",
|
||||
+ "@appcenter@/bin/io.elementary.appcenter",
|
||||
"AppCenter",
|
||||
AppInfoCreateFlags.SUPPORTS_STARTUP_NOTIFICATION
|
||||
);
|
Loading…
Reference in a new issue