lol

wavpack: fix build (#420493)

authored by

Weijia Wang and committed by
GitHub
2cb60192 270488d3

+54 -4
+48
pkgs/by-name/wa/wavpack/Fix-autoreconf-with-gettext-0.25.patch
··· 1 + From ae8d7708e8e28b0d32ef00d18dbd65ed93853811 Mon Sep 17 00:00:00 2001 2 + From: Alyssa Ross <hi@alyssa.is> 3 + Date: Fri, 27 Jun 2025 12:27:58 +0200 4 + Subject: [PATCH] Fix autoreconf with gettext 0.25 5 + 6 + Since gettext 0.25, the AM_ICONV macro is installed into the m4 7 + directory, so we need to add that autoconf config directory. We also 8 + need to make sure autoreconf recognizes that it needs to run autopoint 9 + to install the gettext macros, which it does heuristically by checking 10 + whether AM_GNU_GETTEXT_VERSION is used, so add that and the minimum 11 + amount of other stuff required to make it happy. The version of 12 + gettext we say we use shouldn't matter, so I just went with the 13 + version in ubuntu:latest since that's what CI uses. 14 + 15 + Link: https://github.com/dbry/WavPack/pull/205 16 + --- 17 + Makefile.am | 2 ++ 18 + configure.ac | 3 +++ 19 + 2 files changed, 5 insertions(+) 20 + 21 + diff --git a/Makefile.am b/Makefile.am 22 + index ec20499..6c18f61 100644 23 + --- a/Makefile.am 24 + +++ b/Makefile.am 25 + @@ -1,3 +1,5 @@ 26 + +SUBDIRS = 27 + + 28 + pkgconfigdir = $(libdir)/pkgconfig 29 + pkgconfig_DATA = wavpack.pc 30 + 31 + diff --git a/configure.ac b/configure.ac 32 + index e35bb72..7fb0ebb 100644 33 + --- a/configure.ac 34 + +++ b/configure.ac 35 + @@ -2,7 +2,10 @@ dnl wavpack 5.8.1 configure.ac 36 + 37 + AC_INIT([wavpack], [5.8.1], [bryant@wavpack.com]) 38 + AC_CONFIG_SRCDIR([src/pack.c]) 39 + +AC_CONFIG_MACRO_DIRS([m4]) 40 + AM_INIT_AUTOMAKE([-Wall 1.15 serial-tests subdir-objects foreign no-dist-gzip dist-xz]) 41 + +AM_GNU_GETTEXT_VERSION([0.21]) 42 + +AM_GNU_GETTEXT([external]) 43 + AM_MAINTAINER_MODE 44 + 45 + LIBWAVPACK_MAJOR=5 46 + -- 47 + 2.49.0 48 +
+6 -4
pkgs/by-name/wa/wavpack/package.nix
··· 13 13 14 14 enableParallelBuilding = true; 15 15 16 - nativeBuildInputs = [ autoreconfHook ]; 16 + nativeBuildInputs = [ 17 + autoreconfHook 18 + gettext 19 + ]; 17 20 buildInputs = [ libiconv ]; 18 - 19 - # autogen.sh:9 20 - preAutoreconf = "cp ${gettext}/share/gettext/config.rpath ."; 21 21 22 22 src = fetchFromGitHub { 23 23 owner = "dbry"; ··· 25 25 rev = version; 26 26 hash = "sha256-V9jRIuDpZYIBohJRouGr2TI32BZMXSNVfavqPl56YO0="; 27 27 }; 28 + 29 + patches = [ ./Fix-autoreconf-with-gettext-0.25.patch ]; 28 30 29 31 outputs = [ 30 32 "out"