From 116dbafce7c32d01977b20999c7f6da2a65d23de Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 27 Jun 2025 13:47:54 +0200 Subject: [PATCH] xdg-user-dirs: fix build --- .../xd/xdg-user-dirs/gettext-0.25.patch | 20 +++++++++++++++++++ pkgs/by-name/xd/xdg-user-dirs/package.nix | 5 +++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/by-name/xd/xdg-user-dirs/gettext-0.25.patch diff --git a/pkgs/by-name/xd/xdg-user-dirs/gettext-0.25.patch b/pkgs/by-name/xd/xdg-user-dirs/gettext-0.25.patch new file mode 100644 index 0000000000000..f292da934d593 --- /dev/null +++ b/pkgs/by-name/xd/xdg-user-dirs/gettext-0.25.patch @@ -0,0 +1,20 @@ +diff --git a/configure.ac b/configure.ac +index dc389db..45a35df 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2,6 +2,7 @@ AC_INIT(xdg-user-dirs-update.c) + + AM_INIT_AUTOMAKE(xdg-user-dirs, 0.18) + AM_CONFIG_HEADER(config.h) ++AC_CONFIG_MACRO_DIRS([m4]) + + AM_SANITY_CHECK + AM_MAINTAINER_MODE +@@ -20,6 +21,7 @@ GETTEXT_PACKAGE=xdg-user-dirs + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain name]) + AC_SUBST(GETTEXT_PACKAGE) + ++AM_GNU_GETTEXT_REQUIRE_VERSION([0.14.4]) + AM_GNU_GETTEXT([external]) + + dnl ========================================================================== diff --git a/pkgs/by-name/xd/xdg-user-dirs/package.nix b/pkgs/by-name/xd/xdg-user-dirs/package.nix index d112231213926..17874aaa222f9 100644 --- a/pkgs/by-name/xd/xdg-user-dirs/package.nix +++ b/pkgs/by-name/xd/xdg-user-dirs/package.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-7G8G10lc26N6cyA5+bXhV4vLKWV2/eDaQO2y9SIg3zw="; }; + patches = [ + # https://gitlab.freedesktop.org/xdg/xdg-user-dirs/-/merge_requests/16 + ./gettext-0.25.patch + ]; + postPatch = '' substituteInPlace Makefile.am \ --replace-fail 'libraries = $(LIBINTL)' 'libraries = $(LIBICONV) $(LIBINTL)'