Merge pull request #67389 from jtojnar/xdg-user-dirs
Allow changing xdg-user-dirs with environment.etc
commitd90aa7dc626367053d80388e47fe48c5bc06b887
authorJan Tojnar <jtojnar@gmail.com>
dateSat 24 Aug 2019, 19:22 (7 years ago)
parenta2db4384842683
nixos/modules/programs/environment.nix+1
@@ -21,6 +21,7 @@ in
2121 PAGER = mkDefault "less -R";
2222 EDITOR = mkDefault "nano";
2323 XCURSOR_PATH = [ "$HOME/.icons" ];
24+ XDG_CONFIG_DIRS = [ "/etc/xdg" ]; # needs to be before profile-relative paths to allow changes through environment.etc
2425 };
2526
2627 environment.profiles = mkAfter
pkgs/tools/X11/xdg-user-dirs/default.nix+2−1
@@ -11,8 +11,9 @@ stdenv.mkDerivation rec {
1111 buildInputs = [ libxslt docbook_xsl makeWrapper ];
1212
1313 preFixup = ''
14+ # fallback values need to be last
1415 wrapProgram "$out/bin/xdg-user-dirs-update" \
15− --prefix XDG_CONFIG_DIRS : "$out/etc/xdg"
16+ --suffix XDG_CONFIG_DIRS : "$out/etc/xdg"
1617 '';
1718
1819 meta = with stdenv.lib; {