Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions pkgs/by-name/xd/xdg-user-dirs/gettext-0.25.patch
Original file line number Diff line number Diff line change
@@ -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 ==========================================================================
5 changes: 5 additions & 0 deletions pkgs/by-name/xd/xdg-user-dirs/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
Expand Down