From 0c0404ee06c4d37b3fb10a4e414739a8603edf9a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 25 Aug 2024 13:34:01 +0800
Subject: [PATCH] pantheon.elementary-dock: reinit at 8.0.1

This is completely rewritten.
---
 nixos/tests/pantheon.nix                      |  4 +-
 .../pantheon/apps/elementary-dock/default.nix | 98 +++++++------------
 2 files changed, 39 insertions(+), 63 deletions(-)

diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix
index 0387a0359ab0..8ff20296c482 100644
--- a/nixos/tests/pantheon.nix
+++ b/nixos/tests/pantheon.nix
@@ -56,9 +56,9 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
         machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
 
     with subtest("Check if Pantheon components actually start"):
-        for i in ["gala", "io.elementary.wingpanel", "plank", "gsd-media-keys", "io.elementary.desktop.agent-polkit"]:
+        for i in ["gala", "io.elementary.wingpanel", "io.elementary.dock", "gsd-media-keys", "io.elementary.desktop.agent-polkit"]:
             machine.wait_until_succeeds(f"pgrep -f {i}")
-        for i in ["gala", "io.elementary.wingpanel", "plank"]:
+        for i in ["gala", "io.elementary.wingpanel", "io.elementary.dock"]:
             machine.wait_for_window(i)
         for i in ["bamfdaemon.service", "io.elementary.files.xdg-desktop-portal.service"]:
             machine.wait_for_unit(i, "${user.name}")
diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
index 17c0e12969eb..ce5a4c1fffda 100644
--- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
@@ -1,85 +1,61 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, vala
-, atk
-, cairo
-, dconf
-, glib
-, gtk3
-, libwnck
-, libX11
-, libXfixes
-, libXi
-, pango
-, pkg-config
-, libxml2
-, bamf
-, gdk-pixbuf
-, libdbusmenu-gtk3
-, gnome-menus
-, libgee
-, wrapGAppsHook3
-, meson
-, ninja
-, granite
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  vala,
+  wayland-scanner,
+  wrapGAppsHook4,
+  glib,
+  granite7,
+  gtk4,
+  libadwaita,
+  wayland,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "elementary-dock";
-  version = "unstable-2021-05-07";
+  version = "8.0.1";
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "dock";
-    rev = "113c3b0bc7744501d2101dd7afc1ef21ba66b326";
-    sha256 = "sha256-YlvdB02/hUGaDyHIHy21bgloHyVy3vHcanyNKnp3YbM=";
+    rev = finalAttrs.version;
+    hash = "sha256-Q4Y9FVqzPXoz2Nti1qB5SOJQ0tETPcv2fZPOMkJaND8=";
   };
 
+  depsBuildBuild = [ pkg-config ];
+
   nativeBuildInputs = [
     meson
     ninja
-    libxml2 # xmllint
     pkg-config
     vala
-    wrapGAppsHook3
+    wayland-scanner
+    wrapGAppsHook4
   ];
 
   buildInputs = [
-    atk
-    bamf
-    cairo
-    gdk-pixbuf
     glib
-    gnome-menus
-    dconf
-    granite
-    gtk3
-    libX11
-    libXfixes
-    libXi
-    libdbusmenu-gtk3
-    libgee
-    libwnck
-    pango
+    granite7
+    gtk4
+    libadwaita
+    wayland
   ];
 
-  postInstall = ''
-    # elementary/dock/master is missing a Meson post
-    # install script that does this. This has been
-    # resolved after the dock rewrite (the `main` branch).
-    # https://github.com/elementary/default-settings/issues/267
-    glib-compile-schemas $out/share/glib-2.0/schemas
-  '';
-
-  meta = with lib; {
+  meta = {
     description = "Elegant, simple, clean dock";
     homepage = "https://github.com/elementary/dock";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ davidak ] ++ teams.pantheon.members;
-    mainProgram = "plank";
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = lib.teams.pantheon.members;
+    mainProgram = "io.elementary.dock";
   };
-}
+})