diff options
author | xeji <36407913+xeji@users.noreply.github.com> | 2018-07-29 20:43:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-29 20:43:38 +0200 |
commit | 2791900608041a4557097d671856a3eb11655bf9 (patch) | |
tree | 338dcc4341869dd015b333f044ea9135832a71a9 /nixos | |
parent | 96c638b59e3bf52743066f78b09fb9241a63c325 (diff) | |
parent | 63b8e9a2d14065ac765d4cdc7159cc4035f02cdb (diff) | |
download | nixpkgs-2791900608041a4557097d671856a3eb11655bf9.tar nixpkgs-2791900608041a4557097d671856a3eb11655bf9.tar.gz nixpkgs-2791900608041a4557097d671856a3eb11655bf9.tar.bz2 nixpkgs-2791900608041a4557097d671856a3eb11655bf9.tar.lz nixpkgs-2791900608041a4557097d671856a3eb11655bf9.tar.xz nixpkgs-2791900608041a4557097d671856a3eb11655bf9.tar.zst nixpkgs-2791900608041a4557097d671856a3eb11655bf9.zip |
Merge pull request #40982 from romildo/upd.lxqt
lxqt: 0.12.0 -> 0.13.0
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/lxqt.nix | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index 2596ec4ad85..896f70c86eb 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -41,6 +41,18 @@ in name = "lxqt"; bgSupport = true; start = '' + # Upstream installs default configuration files in + # $prefix/share/lxqt instead of $prefix/etc/xdg, (arguably) + # giving distributors freedom to ship custom default + # configuration files more easily. In order to let the session + # manager find them the share subdirectory is added to the + # XDG_CONFIG_DIRS environment variable. + # + # For an explanation see + # https://github.com/lxqt/lxqt/issues/1521#issuecomment-405097453 + # + export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS''${XDG_CONFIG_DIRS:+:}${config.system.path}/share + exec ${pkgs.lxqt.lxqt-session}/bin/startlxqt ''; }; @@ -53,16 +65,11 @@ in config.environment.lxqt.excludePackages); # Link some extra directories in /run/current-system/software/share - environment.pathsToLink = [ - "/share/desktop-directories" - "/share/icons" - "/share/lxqt" - ]; + environment.pathsToLink = [ "/share" ]; environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ]; services.upower.enable = config.powerManagement.enable; }; - } |