From c0e0c0351bbbc06b114b34cd015cceec51fa75ef Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sun, 13 Jul 2025 20:14:45 +0200 Subject: [PATCH] lightdm: use regular gettext to fix build `glib` gettext is deprecated and currently broken. This fixes the build by using regular gettext instead. --- .../display-managers/lightdm/default.nix | 11 +++++++---- .../lightdm/use-regular-gettext.patch | 13 +++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 pkgs/applications/display-managers/lightdm/use-regular-gettext.patch diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index 802f200440dd..32b6ae0e0c2f 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -8,8 +8,8 @@ plymouth, pam, pkg-config, - autoconf, - automake, + autoreconfHook, + gettext, libtool, libxcb, glib, @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoconf - automake + autoreconfHook + gettext yelp-tools yelp-xsl gobject-introspection @@ -88,6 +88,9 @@ stdenv.mkDerivation rec { (replaceVars ./fix-paths.patch { plymouth = "${plymouth}/bin/plymouth"; }) + + # glib gettext is deprecated and broken, so use regular gettext instead + ./use-regular-gettext.patch ]; dontWrapQtApps = true; diff --git a/pkgs/applications/display-managers/lightdm/use-regular-gettext.patch b/pkgs/applications/display-managers/lightdm/use-regular-gettext.patch new file mode 100644 index 000000000000..78efed8bf8de --- /dev/null +++ b/pkgs/applications/display-managers/lightdm/use-regular-gettext.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 6f2e706f..6307dd59 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -195,6 +195,8 @@ dnl Internationalization + dnl ########################################################################### + + IT_PROG_INTLTOOL(0.35.0) ++AM_GNU_GETTEXT([external]) ++AM_GNU_GETTEXT_VERSION([0.21]) + AC_SUBST(GETTEXT_PACKAGE, lightdm) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", Gettext package) +