diff options
author | Bobby Rong <rjl931189261@126.com> | 2021-07-18 17:57:34 +0800 |
---|---|---|
committer | Bobby Rong <rjl931189261@126.com> | 2021-09-18 19:33:37 +0800 |
commit | a13fd37777bc051dd71944e04d8de7b7649dc02b (patch) | |
tree | c47155f465e779671c1379aa08df468c2d391e37 /pkgs/desktops/pantheon/apps/elementary-dock/default.nix | |
parent | 25070d7d69bd503c27a565e2970922ef12b14861 (diff) | |
download | nixpkgs-a13fd37777bc051dd71944e04d8de7b7649dc02b.tar nixpkgs-a13fd37777bc051dd71944e04d8de7b7649dc02b.tar.gz nixpkgs-a13fd37777bc051dd71944e04d8de7b7649dc02b.tar.bz2 nixpkgs-a13fd37777bc051dd71944e04d8de7b7649dc02b.tar.lz nixpkgs-a13fd37777bc051dd71944e04d8de7b7649dc02b.tar.xz nixpkgs-a13fd37777bc051dd71944e04d8de7b7649dc02b.tar.zst nixpkgs-a13fd37777bc051dd71944e04d8de7b7649dc02b.zip |
pantheon.elementary-dock: unstable-2020-06-11 -> unstable-2021-07-16
Diffstat (limited to 'pkgs/desktops/pantheon/apps/elementary-dock/default.nix')
-rw-r--r-- | pkgs/desktops/pantheon/apps/elementary-dock/default.nix | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix index 797f62cf8e2..e0347e509c6 100644 --- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix @@ -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 |