diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 64b54b3e6bc3..3eb1c3a1013f 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -1,33 +1,39 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , cmake -, pkg-config , glib -, lxqt-build-tools -, lxqt-menu-data -, qtbase -, qtx11extras -, qttools -, qtsvg , kwindowsystem +, libXScrnSaver +, libXcursor +, libXdmcp , libkscreen , liblxqt +, libpthreadstubs , libqtxdg +, libxcb +, lxqt-build-tools +, lxqt-menu-data +, pkg-config +, qtbase +, qtsvg +, qttools +, qtwayland +, wrapQtAppsHook +, xf86inputlibinput , xkeyboard_config -, xorg , gitUpdater }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "lxqt-config"; - version = "1.4.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-ypHjUYRtrWx1Cp9KGSqsWpRHg7zoV0YDW6P4amJKapI="; + hash = "sha256-lFZTu6MqqWTjytYC7In/YJ38PYksZXduHvA/FRY4v0U="; }; nativeBuildInputs = [ @@ -35,34 +41,35 @@ mkDerivation rec { pkg-config lxqt-build-tools qttools + wrapQtAppsHook ]; buildInputs = [ glib.bin - qtbase - qtx11extras - qtsvg kwindowsystem + libXScrnSaver + libXcursor + libXdmcp libkscreen liblxqt + libpthreadstubs libqtxdg + libxcb lxqt-menu-data - xorg.libpthreadstubs - xorg.libXdmcp - xorg.libXScrnSaver - xorg.libxcb - xorg.libXcursor - xorg.xf86inputlibinput - xorg.xf86inputlibinput.dev + qtbase + qtsvg + qtwayland + xf86inputlibinput + xf86inputlibinput.dev ]; postPatch = '' substituteInPlace lxqt-config-appearance/configothertoolkits.cpp \ - --replace 'QStringLiteral("gsettings' \ + --replace-fail 'QStringLiteral("gsettings' \ 'QStringLiteral("${glib.bin}/bin/gsettings' substituteInPlace lxqt-config-input/keyboardlayoutconfig.h \ - --replace '/usr/share/X11/xkb/rules/base.lst' \ + --replace-fail '/usr/share/X11/xkb/rules/base.lst' \ '${xkeyboard_config}/share/X11/xkb/rules/base.lst' '';