Skip to content

Commit

Permalink
xdg-user-dirs: make sure libiconv is linked
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
reckenrode committed Oct 10, 2024
1 parent e694240 commit ff25858
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions pkgs/by-name/xd/xdg-user-dirs/package.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
lib,
stdenv,
autoreconfHook,
fetchurl,
libxslt,
docbook_xsl,
gettext,
libiconv,
makeWrapper,
}:

Expand All @@ -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
Expand Down

0 comments on commit ff25858

Please sign in to comment.