pantheon.wingpanel-applications-menu: 2.4.2 -> 2.4.3

Now finally builds with Meson, where it was available
since last release but needed several fixes to be release quality
IMHO.

Also dropped xdg patch since because meson [0].

https://github.com/elementary/applications-menu/releases/tag/2.4.3

[0]: https://github.com/elementary/applications-menu/commit/58cd96a4cc5c98bbf379f119cd2e92d0142a80d9

2 files changed, 16 insertions, 23 deletions

diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
index 2461ea4875ec5..e905ce9d854b6 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, pantheon, substituteAll, cmake, ninja
+{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, python3
 , pkgconfig, vala, granite, libgee, gettext, gtk3, appstream, gnome-menus
 , json-glib, plank, bamf, switchboard, libunity, libsoup, wingpanel, libwnck3
-, zeitgeist, gobject-introspection, elementary-icon-theme, bc, wrapGAppsHook }:
+, zeitgeist, bc }:
 
 stdenv.mkDerivation rec {
   pname = "applications-menu";
-  version = "2.4.2";
+  version = "2.4.3";
 
   name = "wingpanel-${pname}-${version}";
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "0y7kh50ixvm4m56v18c70s05hhpfp683c4qi3sxy50p2368d772x";
+    sha256 = "15mwfynaa57jii43x77iaz5gqjlylh5zxc70am8zgp8vhgzflvyd";
   };
 
   passthru = {
@@ -25,18 +25,16 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     appstream
-    cmake
-    ninja
     gettext
-    gobject-introspection
+    meson
+    ninja
     pkgconfig
+    python3
     vala
-    wrapGAppsHook
    ];
 
   buildInputs = [
     bamf
-    elementary-icon-theme
     gnome-menus
     granite
     gtk3
@@ -51,6 +49,10 @@ stdenv.mkDerivation rec {
     zeitgeist
    ];
 
+  mesonFlags = [
+    "--sysconfdir=${placeholder ''out''}/etc"
+  ];
+
   PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
   PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
 
@@ -59,9 +61,13 @@ stdenv.mkDerivation rec {
       src = ./bc.patch;
       exec = "${bc}/bin/bc";
     })
-    ./xdg.patch
   ];
 
+  postPatch = ''
+    chmod +x meson/post_install.py
+    patchShebangs meson/post_install.py
+  '';
+
   meta = with stdenv.lib; {
     description = "Lightweight and stylish app launcher for Pantheon";
     homepage = https://github.com/elementary/applications-menu;
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch
deleted file mode 100644
index f17e2581e07e2..0000000000000
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 928976a..7f0ea58 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -90,7 +90,7 @@ link_directories (${DEPS_LIBRARY_DIRS})
- 
- # Installation
- install (TARGETS ${APPNAME} RUNTIME DESTINATION bin)
--install (FILES ${applications_menu} DESTINATION /etc/xdg/menus)
-+install (FILES ${applications_menu} DESTINATION etc/xdg/menus)
- file (GLOB resources "${CMAKE_CURRENT_SOURCE_DIR}/data/*")
- 
- # Settings schema