git.iko.soy/typeable/nixpkgs
on master help sign in
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

commit4ce159c41df1148f14b8f057b338a7c5c6022ffd authorworldofpeace <worldofpeace@protonmail.ch> dateThu 16 May 2019, 19:08 (8 years ago) parent6325918
2 files changed+16−23
pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix+16−10 pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch−13
pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix+16−10
@@ -1,11 +1,11 @@
1−{ stdenv, fetchFromGitHub, pantheon, substituteAll, cmake, ninja
1+{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, python3
22, pkgconfig, vala, granite, libgee, gettext, gtk3, appstream, gnome-menus
33, json-glib, plank, bamf, switchboard, libunity, libsoup, wingpanel, libwnck3
4−, zeitgeist, gobject-introspection, elementary-icon-theme, bc, wrapGAppsHook }:
4+, zeitgeist, bc }:
55
66stdenv.mkDerivation rec {
77 pname = "applications-menu";
8− version = "2.4.2";
8+ version = "2.4.3";
99
1010 name = "wingpanel-${pname}-${version}";
1111
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
1313 owner = "elementary";
1414 repo = pname;
1515 rev = version;
16− sha256 = "0y7kh50ixvm4m56v18c70s05hhpfp683c4qi3sxy50p2368d772x";
16+ sha256 = "15mwfynaa57jii43x77iaz5gqjlylh5zxc70am8zgp8vhgzflvyd";
1717 };
1818
1919 passthru = {
@@ -25,18 +25,16 @@ stdenv.mkDerivation rec {
2525
2626 nativeBuildInputs = [
2727 appstream
28− cmake
29− ninja
3028 gettext
31− gobject-introspection
29+ meson
30+ ninja
3231 pkgconfig
32+ python3
3333 vala
34− wrapGAppsHook
3534 ];
3635
3736 buildInputs = [
3837 bamf
39− elementary-icon-theme
4038 gnome-menus
4139 granite
4240 gtk3
@@ -51,6 +49,10 @@ stdenv.mkDerivation rec {
5149 zeitgeist
5250 ];
5351
52+ mesonFlags = [
53+ "--sysconfdir=${placeholder ''out''}/etc"
54+ ];
55+
5456 PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel";
5557 PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
5658
@@ -59,9 +61,13 @@ stdenv.mkDerivation rec {
5961 src = ./bc.patch;
6062 exec = "${bc}/bin/bc";
6163 })
62− ./xdg.patch
6364 ];
6465
66+ postPatch = ''
67+ chmod +x meson/post_install.py
68+ patchShebangs meson/post_install.py
69+ '';
70+
6571 meta = with stdenv.lib; {
6672 description = "Lightweight and stylish app launcher for Pantheon";
6773 homepage = https://github.com/elementary/applications-menu;
pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff --git a/CMakeLists.txt b/CMakeLists.txt
2−index 928976a..7f0ea58 100644
3−--- a/CMakeLists.txt
4−+++ b/CMakeLists.txt
5−@@ -90,7 +90,7 @@ link_directories (${DEPS_LIBRARY_DIRS})
6−
7− # Installation
8− install (TARGETS ${APPNAME} RUNTIME DESTINATION bin)
9−-install (FILES ${applications_menu} DESTINATION /etc/xdg/menus)
10−+install (FILES ${applications_menu} DESTINATION etc/xdg/menus)
11− file (GLOB resources "${CMAKE_CURRENT_SOURCE_DIR}/data/*")
12−
13− # Settings schema