Skip to content

byzanz: fix build with gettext 0.25 #427190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Aleksanaa merged 1 commit into from
Jul 22, 2025
Merged

byzanz: fix build with gettext 0.25 #427190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions pkgs/by-name/by/byzanz/gettext-0.25.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/configure.ac b/configure.ac
index 620bb26..ce48364 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,8 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE",
AM_GLIB_GNU_GETTEXT
AM_GLIB_DEFINE_LOCALEDIR(GNOMELOCALEDIR)

+AM_GNU_GETTEXT_VERSION([0.25])
+AM_GNU_GETTEXT([external])

AC_PROG_CC
AM_PROG_CC_C_O
11 changes: 10 additions & 1 deletion pkgs/by-name/by/byzanz/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
fetchgit,
wrapGAppsHook3,
cairo,
gettext,
glib,
gnome-common,
gst_all_1,
Expand All @@ -25,7 +26,10 @@ stdenv.mkDerivation {
hash = "sha256-3DUwXCPBAmeCRlDkiPUgwNyBa6bCvC/TLguMCK3bo4E=";
};

patches = [ ./add-amflags.patch ];
patches = [
./add-amflags.patch
./gettext-0.25.patch
];

preBuild = ''
./autogen.sh --prefix=$out
Expand All @@ -37,6 +41,11 @@ stdenv.mkDerivation {
"-Wno-error=discarded-qualifiers"
];

preAutoreconf = ''
# error: possibly undefined macro: AM_NLS
cp ${gettext}/share/gettext/m4/nls.m4 macros/
'';

nativeBuildInputs = [
pkg-config
intltool
Expand Down
Loading