From 9e781ca34aea2dc4373c18cce196efdd7676a675 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 13 Oct 2025 11:11:25 +0200 Subject: [PATCH] lxqt.qlipper: fix CMake 4 compatibility by updating to unstable version This also includes a change to change to Qt6. --- pkgs/desktops/lxqt/default.nix | 4 +--- pkgs/desktops/lxqt/qlipper/default.nix | 10 ++++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index b740d1760d5e..44073196f004 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -53,9 +53,7 @@ let lximage-qt = callPackage ./lximage-qt { }; qps = callPackage ./qps { }; screengrab = callPackage ./screengrab { }; - qlipper = callPackage ./qlipper { - inherit (pkgs.libsForQt5) qtbase qttools; - }; + qlipper = callPackage ./qlipper { }; lxqt-archiver = callPackage ./lxqt-archiver { }; xdg-desktop-portal-lxqt = callPackage ./xdg-desktop-portal-lxqt { }; diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix index 6f38eac36b35..b58716f395cc 100644 --- a/pkgs/desktops/lxqt/qlipper/default.nix +++ b/pkgs/desktops/lxqt/qlipper/default.nix @@ -3,21 +3,22 @@ stdenv, fetchFromGitHub, cmake, + kguiaddons, qtbase, qttools, wrapQtAppsHook, gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qlipper"; - version = "5.1.2"; + version = "5.1.2-unstable-2025-07-04"; src = fetchFromGitHub { owner = "pvanek"; repo = "qlipper"; - rev = version; - hash = "sha256-wHhaRtNiNCk5dtO2dVjRFDVicmYtrnCb2twx6h1m834="; + rev = "d3e605fb9d44c523a95e3aac53c7d179a560c85f"; + hash = "sha256-9V9s0oxWKqd9MHKlkZF3SetrAjHX4cAenAg7as4TLn0="; }; nativeBuildInputs = [ @@ -27,6 +28,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + kguiaddons qtbase ];