diff --git a/pkgs/desktops/xfce/applications/xfdashboard/default.nix b/pkgs/desktops/xfce/applications/xfdashboard/default.nix index 2e590e4ed8a2..54101465e6c0 100644 --- a/pkgs/desktops/xfce/applications/xfdashboard/default.nix +++ b/pkgs/desktops/xfce/applications/xfdashboard/default.nix @@ -2,6 +2,7 @@ lib, mkXfceDerivation, clutter, + gettext, libXcomposite, libXinerama, libXdamage, @@ -19,10 +20,16 @@ mkXfceDerivation { category = "apps"; pname = "xfdashboard"; - version = "1.0.0"; + version = "1.0.0-unstable-2025-07-18"; + # Fix build with gettext 0.25 + rev = "93255940950ef5bc89cab729c8b977a706f98e0c"; rev-prefix = ""; - sha256 = "sha256-iC41I0u9id9irUNyjuvRRzSldF3dzRYkaxb/fgptnq4="; + sha256 = "sha256-Qv0ASuJF0FzPoeLx2D6/kXkxnOJV7mdAFD6PCk+CMac="; + + nativeBuildInputs = [ + gettext + ]; buildInputs = [ clutter diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix index 21ca6797c747..048f75f87d0a 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + gettext, pkg-config, intltool, gtk3, @@ -24,6 +25,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + gettext pkg-config intltool xfce4-dev-tools @@ -37,6 +39,13 @@ stdenv.mkDerivation rec { i3ipc-glib ]; + patches = [ + # Fix build with gettext 0.25 + # https://hydra.nixos.org/build/302762031/nixlog/2 + # FIXME: remove when gettext is fixed + ./gettext-0.25.patch + ]; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/gettext-0.25.patch b/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/gettext-0.25.patch new file mode 100644 index 000000000000..307c8ca563ef --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-i3-workspaces-plugin/gettext-0.25.patch @@ -0,0 +1,21 @@ +diff --git a/configure.ac.in b/configure.ac.in +index 7932c16..1778d38 100644 +--- a/configure.ac.in ++++ b/configure.ac.in +@@ -24,6 +24,7 @@ AC_COPYRIGHT([Copyright (C) 2014 + AC_INIT([xfce4-i3-workspaces-plugin], [plugin_version], [https://github.com/denesb/xfce4-i3-workspaces-plugin/issues], [xfce4-i3-workspaces-plugin]) + AC_PREREQ([2.50]) + AC_REVISION([xfce4_panel_version_build]) ++AC_CONFIG_MACRO_DIRS([m4]) + + dnl *************************** + dnl *** Initialize automake *** +@@ -31,6 +32,8 @@ dnl *************************** + AM_INIT_AUTOMAKE([1.8 no-dist-gzip dist-bzip2 tar-ustar]) + AM_CONFIG_HEADER([config.h]) + AM_MAINTAINER_MODE() ++AM_GNU_GETTEXT_VERSION([0.21]) ++AM_GNU_GETTEXT([external]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + + dnl **************************