Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bb921f516939
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b5df81f1a14f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 1, 2019

  1. nixos/plasma5: add xdg-user-dirs to create user directories

    @worldofpeace
    worldofpeace committed Mar 1, 2019
    Copy the full SHA
    2e5f64b View commit details

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

    nixos/plasma5: add xdg-user-dirs to create user directories
    @worldofpeace
    worldofpeace authored Mar 1, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b5df81f View commit details
Showing with 4 additions and 2 deletions.
  1. +4 −2 nixos/modules/services/x11/desktop-managers/plasma5.nix
6 changes: 4 additions & 2 deletions nixos/modules/services/x11/desktop-managers/plasma5.nix
View file
Original file line number Diff line number Diff line change
@@ -163,6 +163,8 @@ in

libsForQt56.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 ]
@@ -175,9 +177,9 @@ in
++ lib.optional config.services.colord.enable colord-kde
++ 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
"/share"
"/share"
];

environment.etc = singleton {