public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #56553 from worldofpeace/plasma/xdg-user-dirs

Browse Source 
nixos/plasma5: add xdg-user-dirs to create user directories
This commit is contained in:
worldofpeace 2019-03-01 13:25:58 -05:00 committed by GitHub
commit b5df81f1a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/x11/desktop-managers/plasma5.nix
View File

@ -163,6 +163,8 @@ in
libsForQt56.phonon-backend-gstreamer libsForQt56.phonon-backend-gstreamer
libsForQt5.phonon-backend-gstreamer libsForQt5.phonon-backend-gstreamer
xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
] ]
++ lib.optionals cfg.enableQt4Support [ pkgs.phonon-backend-gstreamer ] ++ lib.optionals cfg.enableQt4Support [ pkgs.phonon-backend-gstreamer ]
@ -175,9 +177,9 @@ in
++ lib.optional config.services.colord.enable colord-kde ++ lib.optional config.services.colord.enable colord-kde
++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ]; ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ];
environment.pathsToLink = [ environment.pathsToLink = [
# FIXME: modules should link subdirs of `/share` rather than relying on this # FIXME: modules should link subdirs of `/share` rather than relying on this
"/share" "/share"
]; ];
environment.etc = singleton { environment.etc = singleton {