summary refs log tree commit diff
path: root/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2022-05-26 19:13:45 +0800
committerBobby Rong <rjl931189261@126.com>2022-05-26 19:13:45 +0800
commita15a4f72366877e5e63fcf06a8bf236a1619ca71 (patch)
treeddb9db4e6a0107ea2c4361a8f43d0a70d378f2fe /pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix
parent81de602ac58f8280ac680accf28554b47678cc86 (diff)
downloadnixpkgs-a15a4f72366877e5e63fcf06a8bf236a1619ca71.tar
nixpkgs-a15a4f72366877e5e63fcf06a8bf236a1619ca71.tar.gz
nixpkgs-a15a4f72366877e5e63fcf06a8bf236a1619ca71.tar.bz2
nixpkgs-a15a4f72366877e5e63fcf06a8bf236a1619ca71.tar.lz
nixpkgs-a15a4f72366877e5e63fcf06a8bf236a1619ca71.tar.xz
nixpkgs-a15a4f72366877e5e63fcf06a8bf236a1619ca71.tar.zst
nixpkgs-a15a4f72366877e5e63fcf06a8bf236a1619ca71.zip
pantheon.elementary-onboarding: 6.1.0 -> 7.0.0
Diffstat (limited to 'pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix')
-rw-r--r--pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix46
1 files changed, 15 insertions, 31 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 = ''