ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 12:38:41 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #67389 from jtojnar/xdg-user-dirs

Browse Source 
Allow changing xdg-user-dirs with environment.etc
This commit is contained in:
Jan Tojnar 2019-08-24 19:22:45 +02:00 committed by GitHub
commit d90aa7dc62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/programs/environment.nix
View File

@ -21,6 +21,7 @@ in
PAGER = mkDefault "less -R";
EDITOR = mkDefault "nano";
XCURSOR_PATH = [ "$HOME/.icons" ];
XDG_CONFIG_DIRS = [ "/etc/xdg" ]; # needs to be before profile-relative paths to allow changes through environment.etc
};
environment.profiles = mkAfter

3
pkgs/tools/X11/xdg-user-dirs/default.nix
View File

@ -11,8 +11,9 @@ stdenv.mkDerivation rec {
buildInputs = [ libxslt docbook_xsl makeWrapper ];
preFixup = ''
# fallback values need to be last
wrapProgram "$out/bin/xdg-user-dirs-update" \
--prefix XDG_CONFIG_DIRS : "$out/etc/xdg"
--suffix XDG_CONFIG_DIRS : "$out/etc/xdg"
'';
meta = with stdenv.lib; {