From ff25858fa013538520a332d8b322931756e7abe5 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 23 Sep 2024 19:09:34 -0400 Subject: [PATCH] xdg-user-dirs: make sure libiconv is linked Because the Darwin SDK automatically propagates libiconv, it is no longer linked automatically (because that would link libiconv to everything whether it wanted it or not). xdg-user-dirs is failing to link not because it assumes libiconv comes with libc but because of a bug in its build system. The `configure` script detects how to link libiconv, but `Makefile.am` does not make use of that to link libiconv when it is needed. --- pkgs/by-name/xd/xdg-user-dirs/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xd/xdg-user-dirs/package.nix b/pkgs/by-name/xd/xdg-user-dirs/package.nix index 98d95290ca1e1..f86da5735896e 100644 --- a/pkgs/by-name/xd/xdg-user-dirs/package.nix +++ b/pkgs/by-name/xd/xdg-user-dirs/package.nix @@ -1,11 +1,11 @@ { lib, stdenv, + autoreconfHook, fetchurl, libxslt, docbook_xsl, gettext, - libiconv, makeWrapper, }: @@ -18,9 +18,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-7G8G10lc26N6cyA5+bXhV4vLKWV2/eDaQO2y9SIg3zw="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; + postPatch = '' + substituteInPlace Makefile.am \ + --replace-fail 'libraries = $(LIBINTL)' 'libraries = $(LIBICONV) $(LIBINTL)' + ''; nativeBuildInputs = [ + autoreconfHook makeWrapper libxslt docbook_xsl