diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index dc280a51d4c6..b740d1760d5e 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -74,18 +74,6 @@ let lxqt-build-tools = lxqt-build-tools_0_13; inherit (pkgs.libsForQt5) qttools qtx11extras; }; - lxqt-qtplugin_1_4 = callPackage ./lxqt-qtplugin { - version = "1.4.1"; - lxqt-build-tools = lxqt-build-tools_0_13; - libqtxdg = libqtxdg_3_12; - libfm-qt = libfm-qt_1_4; - inherit (pkgs.libsForQt5) - qtbase - qtsvg - qttools - libdbusmenu - ; - }; qtermwidget_1_4 = callPackage ./qtermwidget { version = "1.4.0"; lxqt-build-tools = lxqt-build-tools_0_13; diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index 88ce2d74396b..dddc16410841 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cmake, libdbusmenu-lxqt, - libdbusmenu ? null, libfm-qt, libqtxdg, lxqt-build-tools, @@ -13,23 +12,17 @@ qtsvg, qttools, wrapQtAppsHook, - version ? "2.2.0", }: stdenv.mkDerivation rec { pname = "lxqt-qtplugin"; - inherit version; + version = "2.2.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = - { - "1.4.1" = "sha256-sp/LvQNfodMYQ4kNbBv4PTNfs38XjYLezuxRltZd4kc="; - "2.2.0" = "sha256-qXadz9JBk4TURAWj6ByP/lGV1u0Z6rNJ/VraBh5zY+Q="; - } - ."${version}"; + hash = "sha256-qXadz9JBk4TURAWj6ByP/lGV1u0Z6rNJ/VraBh5zY+Q="; }; nativeBuildInputs = [ @@ -40,7 +33,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - (if lib.versionAtLeast version "2.0.0" then libdbusmenu-lxqt else libdbusmenu) + libdbusmenu-lxqt libfm-qt libqtxdg qtbase