summary refs log tree commit diff
diff options
context:
space:
mode:
authorJosé Romildo Malaquias <malaquias@gmail.com>2021-05-23 15:06:55 -0300
committerGitHub <noreply@github.com>2021-05-23 15:06:55 -0300
commitde84bd18d750fcc55ffa8052377a168f8ba2bad1 (patch)
tree4c543612acf6295857f1d0276ba48bf3c4aec0f9
parent0e1ad6217ac920fffea1b4d6335fedc045c14cde (diff)
parent65db92f1d2a92fe50460fb4e0d1f60b3e62619d2 (diff)
downloadnixpkgs-de84bd18d750fcc55ffa8052377a168f8ba2bad1.tar
nixpkgs-de84bd18d750fcc55ffa8052377a168f8ba2bad1.tar.gz
nixpkgs-de84bd18d750fcc55ffa8052377a168f8ba2bad1.tar.bz2
nixpkgs-de84bd18d750fcc55ffa8052377a168f8ba2bad1.tar.lz
nixpkgs-de84bd18d750fcc55ffa8052377a168f8ba2bad1.tar.xz
nixpkgs-de84bd18d750fcc55ffa8052377a168f8ba2bad1.tar.zst
nixpkgs-de84bd18d750fcc55ffa8052377a168f8ba2bad1.zip
Merge pull request #121031 from romildo/fix.lxqt
lxqt: does not explicitly require gvfs package
-rw-r--r--nixos/modules/services/x11/desktop-managers/lxqt.nix2
-rw-r--r--pkgs/desktops/lxqt/default.nix1
2 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix
index 7cb92030bb1..71dfad5c7ca 100644
--- a/nixos/modules/services/x11/desktop-managers/lxqt.nix
+++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix
@@ -58,8 +58,8 @@ in
     # Link some extra directories in /run/current-system/software/share
     environment.pathsToLink = [ "/share" ];
 
+    # virtual file systems support for PCManFM-QT
     services.gvfs.enable = true;
-    services.gvfs.package = pkgs.gvfs;
 
     services.upower.enable = config.powerManagement.enable;
   };
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 9e302ebbbd6..062ca4abfe8 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -52,7 +52,6 @@ let
     lxqt-archiver = callPackage ./lxqt-archiver {};
 
     preRequisitePackages = [
-      pkgs.gvfs # virtual file systems support for PCManFM-QT
       libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel
       libsForQt5.libkscreen # provides plugins for screen management software
       pkgs.libfm