talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

dbus-test-runner: use regular gettext to fix build

Browse Source 
`glib` gettext is deprecated and currently broken.
This fixes the build by using regular gettext instead.
This commit is contained in:
Grimmauld 2025-07-13 12:03:32 +02:00
parent ea5785e8c4
commit 7a0af8fd4a
No known key found for this signature in database
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/by-name/db/dbus-test-runner/package.nix
View File

@ -12,6 +12,7 @@
pkg-config, pkg-config,
python3, python3,
xvfb-run, xvfb-run,
gettext,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -24,6 +25,11 @@ stdenv.mkDerivation (finalAttrs: {
sha256 = "sha256-4yH19X98SVqpviCBIWzIX6FYHWxCbREpuKCNjQuTFDk="; sha256 = "sha256-4yH19X98SVqpviCBIWzIX6FYHWxCbREpuKCNjQuTFDk=";
}; };
patches = [
# glib gettext is deprecated and broken, so use regular gettext instead
./use-regular-gettext.patch
];
postPatch = '' postPatch = ''
patchShebangs tests/test-wait-outputer patchShebangs tests/test-wait-outputer
@ -39,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook autoreconfHook
glib # for autoconf macro, gtester, gdbus glib # for autoconf macro, gtester, gdbus
gettext
intltool intltool
pkg-config pkg-config
]; ];

12
pkgs/by-name/db/dbus-test-runner/use-regular-gettext.patch Normal file
View File

@ -0,0 +1,12 @@
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,8 @@ GETTEXT_PACKAGE=dbus-test-runner
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the default gettext domain])
-AM_GLIB_GNU_GETTEXT
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.21])
###########################
# gcov coverage reporting