diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index 94d461a590ac..f249a091572b 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -1,58 +1,44 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson , ninja , vala -, libxml2 , desktop-file-utils -, gtk3 +, gtk4 , glib -, granite +, granite7 , libgee -, libhandy -, wrapGAppsHook +, wrapGAppsHook4 }: stdenv.mkDerivation rec { pname = "elementary-shortcut-overlay"; - version = "1.2.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "shortcut-overlay"; rev = version; - sha256 = "sha256-qmqzGCM3cVM6y80pzjm5CCyG6BO6XlKZiODAAEnwVrM="; + sha256 = "sha256-YVeCO7mZmf+FEY4d8tvC76lW/HkOwQ6kw7nvmzAFEtw="; }; - patches = [ - # Fix build with meson 0.61 - # https://github.com/elementary/shortcut-overlay/pull/113 - (fetchpatch { - url = "https://github.com/elementary/shortcut-overlay/commit/130f78eb4b7770586ea98ba0a5fdbbf5bb116f3f.patch"; - sha256 = "sha256-XXWq9CEv3Z2B8ogcFQAJZCfy19XxNHs3c8NToE2m/aA="; - }) - ]; - nativeBuildInputs = [ desktop-file-utils - libxml2 meson ninja pkg-config vala - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ glib - granite - gtk3 + granite7 + gtk4 libgee - libhandy ]; passthru = {