From 8351e9b60266966a91362f1aa44cefd441107990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 18 Apr 2024 14:21:39 -0300 Subject: [PATCH] lxqt.liblxqt: 1.4.0 -> 2.0.0 --- pkgs/desktops/lxqt/liblxqt/default.nix | 34 +++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index 8a5316d73f53..430c33c03605 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -1,42 +1,42 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , cmake -, lxqt-build-tools -, qtx11extras -, qttools -, qtsvg -, libqtxdg -, polkit-qt -, kwindowsystem -, xorg , gitUpdater +, kwindowsystem +, libXScrnSaver +, libqtxdg +, lxqt-build-tools +, polkit-qt-1 +, qtsvg +, qttools +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "liblxqt"; - version = "1.4.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-daD4okYc4J2nRrO6423W0IUK9173zcepCvvMtx7Vho4="; + hash = "sha256-ClAmREsPBb7i7T2aGgf0h3rk1ohUvWQvmSnrlprHzds="; }; nativeBuildInputs = [ cmake lxqt-build-tools qttools + wrapQtAppsHook ]; buildInputs = [ - qtx11extras - qtsvg - polkit-qt kwindowsystem + libXScrnSaver libqtxdg - xorg.libXScrnSaver + polkit-qt-1 + qtsvg ]; # convert name of wrapped binary, e.g. .lxqt-whatever-wrapped to the original name, e.g. lxqt-whatever so binaries can find their resources @@ -45,7 +45,7 @@ mkDerivation rec { postPatch = '' # https://github.com/NixOS/nixpkgs/issues/119766 substituteInPlace lxqtbacklight/linux_backend/driver/libbacklight_backend.c \ - --replace "pkexec lxqt-backlight_backend" "pkexec $out/bin/lxqt-backlight_backend" + --replace-fail "pkexec lxqt-backlight_backend" "pkexec $out/bin/lxqt-backlight_backend" sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt '';