From 277577f3fa1d9ae3278c4441649e2ee0e5a7f8f1 Mon Sep 17 00:00:00 2001 From: euxane Date: Tue, 2 Dec 2025 16:31:59 +0100 Subject: [PATCH] moc: fix build (undefined AM_ICONV from gettext) This fixes the following build error: configure.in:399: error: possibly undefined macro: AM_ICONV If this token and others are legitimate, please use m4_pattern_allow. See the Autoconf documentation. autoreconf: error: /nix/store/0a184ki65w8ra3qmn2qc8clamfjmxdfz-autoconf-2.72/bin/autoconf failed with exit status: 1 --- pkgs/by-name/mo/moc/fix_gettext_0_25.patch | 17 +++++++++++++++++ pkgs/by-name/mo/moc/package.nix | 3 +++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/by-name/mo/moc/fix_gettext_0_25.patch diff --git a/pkgs/by-name/mo/moc/fix_gettext_0_25.patch b/pkgs/by-name/mo/moc/fix_gettext_0_25.patch new file mode 100644 index 000000000000..1efbe84e73bb --- /dev/null +++ b/pkgs/by-name/mo/moc/fix_gettext_0_25.patch @@ -0,0 +1,17 @@ +diff --git a/configure.in b/configure.in +index eb71bdf..ba056df 100644 +--- a/configure.in ++++ b/configure.in +@@ -1,9 +1,12 @@ + AC_INIT([Music On Console],[2.6-alpha3],[mocmaint@daper.net],[moc], + [http://moc.daper.net/]) ++AC_CONFIG_MACRO_DIRS([m4]) + AC_CONFIG_SRCDIR([main.c]) + AC_CONFIG_HEADERS([config.h]) + + AM_INIT_AUTOMAKE([dist-xz no-dist-gzip]) ++AM_GNU_GETTEXT_VERSION([0.20]) ++AM_GNU_GETTEXT([external]) + + AC_PREREQ([2.64]) + diff --git a/pkgs/by-name/mo/moc/package.nix b/pkgs/by-name/mo/moc/package.nix index 676b435661ba..bb9c35333e23 100644 --- a/pkgs/by-name/mo/moc/package.nix +++ b/pkgs/by-name/mo/moc/package.nix @@ -6,6 +6,7 @@ pkg-config, autoreconfHook, autoconf-archive, + gettext, ncurses, db, popt, @@ -79,6 +80,7 @@ stdenv.mkDerivation { }) ./use-ax-check-compile-flag.patch + ./fix_gettext_0_25.patch ] ++ lib.optional pulseSupport ./pulseaudio.patch; @@ -90,6 +92,7 @@ stdenv.mkDerivation { pkg-config autoreconfHook autoconf-archive + gettext ]; buildInputs = [