From ea5639fcf484f8f7e364315f6dabbc3c1f15a8ff Mon Sep 17 00:00:00 2001 From: jD91mZM2 Date: Mon, 1 Mar 2021 12:34:57 +0100 Subject: [PATCH] vala-panel-appmenu-plugin: delete --- pkgs/desktops/xfce/default.nix | 2 - .../appmenu-gtk-module.nix | 31 ---------- .../default.nix | 56 ------------------- .../fix-bamf-dependency.patch | 12 ---- 4 files changed, 101 deletions(-) delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix delete 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 de8ae12b8952..12f487f1784c 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -102,8 +102,6 @@ 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 { }; xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin { }; 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 deleted file mode 100644 index 44374c2822a6..000000000000 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, vala, glib, gtk2, gtk3 }: -stdenv.mkDerivation rec { - pname = "vala-panel-appmenu-xfce"; - 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 lib; { - description = "Port of the Unity GTK Module"; - license = licenses.lgpl3; - maintainers = with lib.maintainers; [ ]; - }; -} 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 deleted file mode 100644 index 76aea188e350..000000000000 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, callPackage, pkg-config, cmake, vala, libxml2, - glib, pcre, gtk2, gtk3, xorg, libxkbcommon, epoxy, at-spi2-core, dbus-glib, bamf, - xfce, libwnck3, libdbusmenu, gobject-introspection }: - -stdenv.mkDerivation rec { - pname = "xfce4-vala-panel-appmenu-plugin"; - version = "0.7.3"; - - src = fetchFromGitHub { - owner = "rilian-la-te"; - repo = "vala-panel-appmenu"; - rev = version; - fetchSubmodules = true; - - sha256 = "06rykdr2c9rnzxwinwdynd73v9wf0gjkx6qfva7sx2n94ajsdnaw"; - }; - - nativeBuildInputs = [ pkg-config 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 gobject-introspection ]; - - 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 - ''; - - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.gitLister src.meta.homepage; - }; - - meta = with lib; { - description = "Global Menu applet for XFCE4"; - license = licenses.lgpl3; - maintainers = with lib.maintainers; [ ]; - broken = true; - }; -} 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 deleted file mode 100644 index 1ed86a67f727..000000000000 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch +++ /dev/null @@ -1,12 +0,0 @@ -+++ 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 - ) -