pantheon.elementary-dock: unstable-2020-06-11 -> unstable-2021-07-16

2021-09-18 19:33:37 +08:00
parent 25070d7d69
commit a13fd37777
1 changed files with 5 additions and 12 deletions
@@ -1,6 +1,5 @@
 { lib, stdenv
 , fetchFromGitHub
-, fetchpatch
 , vala
 , atk
 , cairo
@@ -24,11 +23,12 @@
 , pantheon
 , meson
 , ninja
+, granite
 }:

 stdenv.mkDerivation rec {
  pname = "elementary-dock";
-  version = "unstable-2020-06-11";
+  version = "unstable-2021-07-16";

  outputs = [ "out" "dev" ];

@@ -37,18 +37,10 @@ stdenv.mkDerivation rec {
  src = fetchFromGitHub {
    owner = "elementary";
    repo = repoName;
-    rev = "0a389ee58939d8c91c340df4e5340fc4b23d0b80";
-    sha256 = "01vinik73s0vmk56samgf49zr2bl4wjv44x15sz2cmh744llckja";
+    rev = "05fd6fccdf1a769f6737a0d7e57e092825348660";
+    sha256 = "0lqqq5cx0kk8y7qyjx7z2k3v1kw2xxzns968ianarcji19wzcns4";
  };

-  patches = [
-    # Fix double includedir path in plank.pc
-    (fetchpatch {
-      url = "https://github.com/elementary/dock/commit/3bc368e2c4fafcd5b8baca2711c773b0e2441c7c.patch";
-      sha256 = "0gg35phi1cg7ixljc388i0h70w323r1gqzjhanccnsbjpqsgvs3k";
-    })
-  ];
-
  nativeBuildInputs = [
    gettext
    meson
@@ -67,6 +59,7 @@ stdenv.mkDerivation rec {
    glib
    gnome-menus
    dconf
+    granite
    gtk3
    libX11
    libXfixes