pantheon.elementary-onboarding: 6.1.0 -> 7.0.0

2 files changed, 15 insertions, 44 deletions

diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
index fa4ff7edf12..a68fa726872 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
@@ -1,66 +1,50 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , nix-update-script
-, substituteAll
-, pkg-config
 , meson
 , ninja
-, vala
+, pkg-config
 , python3
-, gtk3
+, vala
+, wrapGAppsHook4
+, appcenter
+, elementary-settings-daemon
 , glib
-, granite
+, granite7
+, gtk4
+, libadwaita
 , libgee
-, elementary-settings-daemon
-, gettext
-, libhandy
-, wrapGAppsHook
-, appcenter
 }:
 
 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 = ''
diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/fix-paths.patch b/pkgs/desktops/pantheon/desktop/elementary-onboarding/fix-paths.patch
deleted file mode 100644
index c98d898bb48..00000000000
--- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/fix-paths.patch
+++ /dev/null
@@ -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
-                 );