From d7e49cfc5605828db27d2511c1a9f2e3fd1ef01f Mon Sep 17 00:00:00 2001 From: jD91mZM2 Date: Sun, 6 May 2018 11:19:59 +0200 Subject: [PATCH] vala-panel-appmenu: init at 0.6.94 --- pkgs/desktops/xfce/default.nix | 2 + .../appmenu-gtk-module.nix | 31 ++++++++++++ .../default.nix | 49 +++++++++++++++++++ .../fix-bamf-dependency.patch | 12 +++++ 4 files changed, 94 insertions(+) create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index d83e51a676cd..67580c530726 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -97,6 +97,8 @@ lib.makeScope pkgs.newScope (self: with self; { #### PANEL PLUGINS + xfce4-vala-panel-appmenu-plugin = callPackage ./panel-plugins/xfce4-vala-panel-appmenu-plugin { }; + xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin.nix { }; xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin.nix { }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix new file mode 100644 index 000000000000..4db9e03ae721 --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, substituteAll, cmake, vala, glib, gtk2, gtk3 }: +stdenv.mkDerivation rec { + name = "vala-panel-appmenu-xfce-${version}"; + version = "0.6.94"; + + src = "${fetchFromGitHub { + owner = "rilian-la-te"; + repo = "vala-panel-appmenu"; + rev = version; + fetchSubmodules = true; + + sha256 = "0xxn3zs60a9nfix8wrdp056wviq281cm1031hznzf1l38lp3wr5p"; + }}/subprojects/appmenu-gtk-module"; + + nativeBuildInputs = [ cmake vala ]; + buildInputs = [ glib gtk2 gtk3 ]; + + configurePhase = '' + cmake . -DGTK3_INCLUDE_GDK= + ''; + installPhase = '' + make DESTDIR=output install + cp -r output/var/empty/* "$out" + ''; + + meta = with stdenv.lib; { + description = "Port of the Unity GTK+ Module"; + license = licenses.lgpl3; + maintainers = with maintainers; [ jD91mZM2 ]; + }; +} diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix new file mode 100644 index 000000000000..e1825d21ca7e --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, substituteAll, callPackage, pkgconfig, cmake, vala, libxml2, + glib, pcre, gtk2, gtk3, xorg, libxkbcommon, epoxy, at-spi2-core, dbus-glib, bamf, + xfce, libwnck3, libdbusmenu-glib, gobjectIntrospection }: + +stdenv.mkDerivation rec { + name = "xfce4-vala-panel-appmenu-plugin-${version}"; + version = "0.6.94"; + + src = fetchFromGitHub { + owner = "rilian-la-te"; + repo = "vala-panel-appmenu"; + rev = version; + fetchSubmodules = true; + + sha256 = "0xxn3zs60a9nfix8wrdp056wviq281cm1031hznzf1l38lp3wr5p"; + }; + + nativeBuildInputs = [ pkgconfig cmake vala libxml2.bin ]; + buildInputs = [ (callPackage ./appmenu-gtk-module.nix {}) + glib pcre gtk2 gtk3 xorg.libpthreadstubs xorg.libXdmcp libxkbcommon epoxy + at-spi2-core dbus-glib bamf xfce.xfce4panel_gtk3 xfce.libxfce4util xfce.xfconf + libwnck3 libdbusmenu-glib gobjectIntrospection ]; + + patches = [ + (substituteAll { + src = ./fix-bamf-dependency.patch; + bamf = bamf; + }) + ]; + + cmakeFlags = [ + "-DENABLE_XFCE=ON" + "-DENABLE_BUDGIE=OFF" + "-DENABLE_VALAPANEL=OFF" + "-DENABLE_MATE=OFF" + "-DENABLE_JAYATANA=OFF" + "-DENABLE_APPMENU_GTK_MODULE=OFF" + ]; + + preConfigure = '' + mv cmake/FallbackVersion.cmake.in cmake/FallbackVersion.cmake + ''; + + meta = with stdenv.lib; { + description = "Global Menu applet for XFCE4"; + license = licenses.lgpl3; + maintainers = with maintainers; [ jD91mZM2 ]; + }; +} diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch new file mode 100644 index 000000000000..1ed86a67f727 --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch @@ -0,0 +1,12 @@ ++++ source/cmake/FindBAMF.cmake 2018-05-11 17:03:44.385917811 +0200 +@@ -80,9 +80,7 @@ + + find_program(BAMF_DAEMON_EXECUTABLE + bamfdaemon +- HINTS ${CMAKE_INSTALL_FULL_LIBDIR} +- ${CMAKE_INSTALL_FULL_LIBEXECDIR} +- ${BAMF_LIBDIR} ++ HINTS "@bamf@/libexec/bamf/" + PATH_SUFFIXES bamf + ) +