diff options
Diffstat (limited to 'pkgs/desktops/xfce/panel-plugins')
5 files changed, 34 insertions, 56 deletions
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix index 2dad2d688ecae..8e8da34856386 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin/default.nix @@ -8,7 +8,7 @@ , keybinder3 , pkg-config , python3Packages -, wrapGAppsHook +, wrapGAppsHook3 , xfce }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { gobject-introspection pkg-config python3Packages.wrapPython - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-docklike-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-docklike-plugin/default.nix index 0451afc54b22f..3f9b414e7713d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-docklike-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-docklike-plugin/default.nix @@ -31,7 +31,7 @@ mkXfceDerivation { meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-docklike-plugin/start"; - description = "A modern, minimalist taskbar for Xfce"; + description = "Modern, minimalist taskbar for Xfce"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ ] ++ teams.xfce.members; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix deleted file mode 100644 index 032b29eaef3d4..0000000000000 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, stdenv, pkg-config, fetchFromGitHub, python3, vala -, gtk3, libwnck, libxfce4util, xfce4-panel, wafHook, xfce -, gitUpdater -}: - -stdenv.mkDerivation rec { - pname = "xfce4-namebar-plugin"; - version = "1.0.0"; - - src = fetchFromGitHub { - owner = "HugLifeTiZ"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-aKrJzf9rwCyXAJsRIXdBzmJBASuXD5I5kZrp+atx4FA="; - }; - - nativeBuildInputs = [ pkg-config vala wafHook python3 ]; - buildInputs = [ gtk3 libwnck libxfce4util xfce4-panel ]; - - postPatch = '' - substituteInPlace src/namebar.vala --replace 'var dirs = Environment.get_system_data_dirs()' "string[] dirs = { \"$out/share\" }" - substituteInPlace src/preferences.vala --replace 'var dir_strings = Environment.get_system_data_dirs()' "string[] dir_strings = { \"$out/share\" }" - ''; - - passthru.updateScript = gitUpdater { - rev-prefix = "v"; - }; - - meta = with lib; { - homepage = "https://github.com/HugLifeTiZ/xfce4-namebar-plugin"; - description = "Plugin which integrates titlebar and window controls into the xfce4-panel"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ ] ++ teams.xfce.members; - # Does not build with vala 0.48 or later - # libxfce4panel-2.0.vapi:92.3-92.41: error: overriding method `Xfce.PanelPlugin.remote_event' is incompatible - # with base method `bool Xfce.PanelPluginProvider.remote_event (string, GLib.Value, uint)': too few parameters. - # public virtual signal bool remote_event (string name, GLib.Value value); - # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - # Upstream has no activity since 20 May 2020 - broken = true; - }; -} diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix index 4a3148962efde..dbc96665344f8 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix @@ -1,5 +1,20 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk3, libxfce4ui, - libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu, gitUpdater +{ + stdenv, + lib, + fetchurl, + pkg-config, + intltool, + gtk3, + libxfce4ui, + libxfce4util, + xfce4-panel, + libnotify, + lm_sensors, + hddtemp, + netcat-gnu, + libXNVCtrl, + nvidiaSupport ? lib.meta.availableOn stdenv.hostPlatform libXNVCtrl, + gitUpdater, }: let @@ -7,7 +22,7 @@ let in stdenv.mkDerivation rec { - pname = "xfce4-sensors-plugin"; + pname = "xfce4-sensors-plugin"; version = "1.4.4"; src = fetchurl { @@ -29,14 +44,20 @@ stdenv.mkDerivation rec { lm_sensors hddtemp netcat-gnu - ]; + ] ++ lib.optionals nvidiaSupport [ libXNVCtrl ]; enableParallelBuilding = true; - configureFlags = [ - "--with-pathhddtemp=${hddtemp}/bin/hddtemp" - "--with-pathnetcat=${netcat-gnu}/bin/netcat" - ]; + configureFlags = + [ + "--with-pathhddtemp=${hddtemp}/bin/hddtemp" + "--with-pathnetcat=${netcat-gnu}/bin/netcat" + ] + ++ lib.optionals nvidiaSupport [ + # Have to be explicitly enabled since this tries to figure out the default + # based on the existence of a hardcoded `/usr/include/NVCtrl` path. + "--enable-xnvctrl" + ]; passthru.updateScript = gitUpdater { url = "https://gitlab.xfce.org/panel-plugins/${pname}"; @@ -45,7 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin"; - description = "A panel plug-in for different sensors using acpi, lm_sensors and hddtemp"; + description = "Panel plug-in for different sensors using acpi, lm_sensors and hddtemp"; mainProgram = "xfce4-sensors"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix index a76d3cdb53440..8683c8cb20918 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-verve-plugin/default.nix @@ -24,7 +24,7 @@ mkXfceDerivation { ]; meta = with lib; { - description = "A command-line plugin"; + description = "Command-line plugin"; maintainers = with maintainers; [ ] ++ teams.xfce.members; }; } |