diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index 0349d61abbcd..4a89ee880ca2 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -31,6 +31,7 @@ in }; environment.systemPackages = [ + pkgs.kde5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel pkgs.kde5.oxygen-icons5 # default icon theme pkgs.libfm pkgs.libfm-extra diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix index 844aa3f82498..d5786444fadb 100644 --- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg, -libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache, lxmenu-data }: +libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache, +lxmenu-data }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { qt5.libdbusmenu kde5.kwindowsystem kde5.solid + kde5.kguiaddons lxqt.liblxqt lxqt.libqtxdg lxqt.lxqt-globalkeys diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index ad5bed349dbd..d559d2954370 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -6,8 +6,8 @@ let self = rec { # For compiling information, see: - # - https://github.com/lxde/lxqt/wiki/Building-from-source - + # - https://github.com/lxde/lxqt/wiki/Building-from-source + standardPatch = '' for file in $(find . -name CMakeLists.txt); do substituteInPlace $file \ @@ -21,7 +21,7 @@ let echo $file grep --color=always DESTINATION $file || true grep --color=always share/lxqt/translations $file || true - grep --color=always platformthemes $file || true + grep --color=always platform $file || true done echo -------------------------------------------------------- ''; @@ -56,5 +56,7 @@ let ### OPTIONAL qterminal = callPackage ./optional/qterminal { }; + + }; in self