diff --git a/pkgs/by-name/by/byzanz/gettext-0.25.patch b/pkgs/by-name/by/byzanz/gettext-0.25.patch new file mode 100644 index 0000000000000..7ac3ef843124b --- /dev/null +++ b/pkgs/by-name/by/byzanz/gettext-0.25.patch @@ -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 diff --git a/pkgs/by-name/by/byzanz/package.nix b/pkgs/by-name/by/byzanz/package.nix index c12ea0e7777c2..e0956297a69cd 100644 --- a/pkgs/by-name/by/byzanz/package.nix +++ b/pkgs/by-name/by/byzanz/package.nix @@ -4,6 +4,7 @@ fetchgit, wrapGAppsHook3, cairo, + gettext, glib, gnome-common, gst_all_1, @@ -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 @@ -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