From d80c584f9f5e472f8ae69d34c380352bbcb73bb7 Mon Sep 17 00:00:00 2001 From: David Wronek Date: Tue, 3 Mar 2026 08:32:26 +0100 Subject: [PATCH] xdg-user-dirs: split outputs This change is required to fix locales, as without the `lib` output `localedir` is set to `share/locale`, causing xdg-user-dirs to fall back to searching for locales in `$XDG_DATA_DIRS`, unsuccessfully. Before: ``` $ strings result/bin/.xdg-user-dirs-update-wrapped | grep share share/locale ``` After: ``` $ strings result/bin/.xdg-user-dirs-update-wrapped | grep share /nix/store/9m66155g6hpnnhn7mz5ac70qbdspkjfl-xdg-user-dirs-0.19-lib/share/locale ``` Signed-off-by: David Wronek --- pkgs/by-name/xd/xdg-user-dirs-gtk/package.nix | 2 +- pkgs/by-name/xd/xdg-user-dirs/package.nix | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/xd/xdg-user-dirs-gtk/package.nix b/pkgs/by-name/xd/xdg-user-dirs-gtk/package.nix index b13967cb7888..b1ec5de29cf8 100644 --- a/pkgs/by-name/xd/xdg-user-dirs-gtk/package.nix +++ b/pkgs/by-name/xd/xdg-user-dirs-gtk/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { # Fetch “xdg-user-dirs” translations from correct localedir. substituteInPlace update.c --replace-fail \ 'bindtextdomain ("xdg-user-dirs", GLIBLOCALEDIR);' \ - 'bindtextdomain ("xdg-user-dirs", "${xdg-user-dirs}/share/locale");' + 'bindtextdomain ("xdg-user-dirs", "${lib.getLib xdg-user-dirs}/share/locale");' patchShebangs meson_custom_install_desktop_file.sh ''; diff --git a/pkgs/by-name/xd/xdg-user-dirs/package.nix b/pkgs/by-name/xd/xdg-user-dirs/package.nix index 3b87f75c7f07..fdd681560b29 100644 --- a/pkgs/by-name/xd/xdg-user-dirs/package.nix +++ b/pkgs/by-name/xd/xdg-user-dirs/package.nix @@ -22,6 +22,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-6S3rkpwQ1LKTKTl6+KJYUQEkf35hd6xvHSjoITDtjBk="; }; + outputs = [ + "out" + "lib" + "man" + ]; + nativeBuildInputs = [ meson ninja -- knotmirror 0.0.1