From 28a02c2950af49c5b4d785cd828f7daba143460d Mon Sep 17 00:00:00 2001 From: Felix Uhl Date: Sat, 9 Mar 2024 22:50:35 +0100 Subject: [PATCH 1/2] xdg-user-dirs: fix manpage rendering Previously, `man xdg-user-dirs-update` contained this: ``` --set NAME PATH Sets the XDG user dir with the given name. NAME should be one of the following: PATH must be an absolute path, e.g. $HOME/Some/Directory. ``` Now, it's correctly rendered: ``` --set NAME PATH Sets the XDG user dir with the given name. NAME should be one of the following: DESKTOP DOWNLOAD TEMPLATES PUBLICSHARE DOCUMENTS MUSIC PICTURES VIDEOS PATH must be an absolute path, e.g. $HOME/Some/Directory. ``` --- pkgs/by-name/xd/xdg-user-dirs/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/xd/xdg-user-dirs/package.nix b/pkgs/by-name/xd/xdg-user-dirs/package.nix index 98d95290ca1e..2d34d345844e 100644 --- a/pkgs/by-name/xd/xdg-user-dirs/package.nix +++ b/pkgs/by-name/xd/xdg-user-dirs/package.nix @@ -4,6 +4,7 @@ fetchurl, libxslt, docbook_xsl, + docbook_xml_dtd_43, gettext, libiconv, makeWrapper, @@ -24,6 +25,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper libxslt docbook_xsl + docbook_xml_dtd_43 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ gettext ]; preFixup = '' From 281573e95dea3562a0818f9080e00328c9d92bfb Mon Sep 17 00:00:00 2001 From: Felix Uhl Date: Sat, 9 Mar 2024 23:22:27 +0100 Subject: [PATCH 2/2] xdg-user-dirs: add iFreilicht as maintainer for darwin --- pkgs/by-name/xd/xdg-user-dirs/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/xd/xdg-user-dirs/package.nix b/pkgs/by-name/xd/xdg-user-dirs/package.nix index 2d34d345844e..8cd61bf7a8ac 100644 --- a/pkgs/by-name/xd/xdg-user-dirs/package.nix +++ b/pkgs/by-name/xd/xdg-user-dirs/package.nix @@ -38,7 +38,10 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://freedesktop.org/wiki/Software/xdg-user-dirs"; description = "Tool to help manage well known user directories like the desktop folder and the music folder"; license = licenses.gpl2; - maintainers = with maintainers; [ donovanglover ]; + maintainers = with maintainers; [ + donovanglover + iFreilicht + ]; platforms = platforms.unix; mainProgram = "xdg-user-dirs-update"; };