aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/desktops/pantheon/apps/elementary-dock/default.nix')
-rw-r--r--nixpkgs/pkgs/desktops/pantheon/apps/elementary-dock/default.nix15
1 files changed, 12 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
index ee9df9955f4..7cc34f8c82c 100644
--- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
+++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-dock/default.nix
@@ -1,5 +1,6 @@
{ stdenv
, fetchFromGitHub
+, fetchpatch
, vala
, atk
, cairo
@@ -27,7 +28,7 @@
stdenv.mkDerivation rec {
pname = "elementary-dock";
- version = "unstable-2020-02-28";
+ version = "unstable-2020-06-11";
outputs = [ "out" "dev" ];
@@ -36,10 +37,18 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "elementary";
repo = repoName;
- rev = "ac87d9063dc9c81d90f42f3002ad9c5b49460a82";
- sha256 = "0lhjzd370fza488dav8n155ss486wqv6y7ldkahwg0c3zvlsvha7";
+ rev = "0a389ee58939d8c91c340df4e5340fc4b23d0b80";
+ sha256 = "01vinik73s0vmk56samgf49zr2bl4wjv44x15sz2cmh744llckja";
};
+ patches = [
+ # Fix double includedir path in plank.pc
+ (fetchpatch {
+ url = "https://github.com/elementary/dock/commit/3bc368e2c4fafcd5b8baca2711c773b0e2441c7c.patch";
+ sha256 = "0gg35phi1cg7ixljc388i0h70w323r1gqzjhanccnsbjpqsgvs3k";
+ })
+ ];
+
nativeBuildInputs = [
gettext
meson