From 717d217d451611e3bf42fae12b19917d2012caab Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 21 Aug 2025 23:27:52 +0200 Subject: [PATCH] kdbg: 3.1.0 -> 3.2.0 --- pkgs/development/tools/misc/kdbg/default.nix | 40 ++++++++++---------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/pkgs/development/tools/misc/kdbg/default.nix b/pkgs/development/tools/misc/kdbg/default.nix index f442bd561341..349ffc59be2e 100644 --- a/pkgs/development/tools/misc/kdbg/default.nix +++ b/pkgs/development/tools/misc/kdbg/default.nix @@ -3,41 +3,39 @@ stdenv, fetchurl, cmake, - extra-cmake-modules, - qt5, - ki18n, - kconfig, - kiconthemes, - kxmlgui, - kwindowsystem, - qtbase, - makeWrapper, + qt6, + kdePackages, }: stdenv.mkDerivation rec { pname = "kdbg"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "mirror://sourceforge/kdbg/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-aLX/0GXof77NqQj7I7FUCZjyDtF1P8MJ4/NHJNm4Yr0="; + url = "mirror://sourceforge/kdbg/${version}/kdbg-${version}.tar.gz"; + hash = "sha256-GoWLKWD/nWXBTiTbDLxeNArDMyPI/gSzADqyOgxrNHE="; }; nativeBuildInputs = [ cmake - extra-cmake-modules - makeWrapper + kdePackages.extra-cmake-modules + qt6.wrapQtAppsHook ]; buildInputs = [ - qt5.qtbase - ki18n - kconfig - kiconthemes - kxmlgui - kwindowsystem + qt6.qt5compat + qt6.qtbase + kdePackages.ki18n + kdePackages.kconfig + kdePackages.kiconthemes + kdePackages.kxmlgui + kdePackages.kwindowsystem + ]; + + cmakeFlags = [ + (lib.cmakeFeature "BUILD_FOR_KDE_VERSION" "6") ]; postInstall = '' - wrapProgram $out/bin/kdbg --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix} + wrapProgram $out/bin/kdbg --prefix QT_PLUGIN_PATH : ${qt6.qtbase}/${qt6.qtbase.qtPluginPrefix} ''; dontWrapQtApps = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db14e2e1bb15..4d6173bbe8be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3413,7 +3413,7 @@ with pkgs; lua = lua5_2_compat; }; - kdbg = libsForQt5.callPackage ../development/tools/misc/kdbg { }; + kdbg = callPackage ../development/tools/misc/kdbg { }; kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { };