From 78729c2c4a98cfe7ecc046114519c0e0968d4609 Mon Sep 17 00:00:00 2001 From: Rexiel Scarlet <37258415+Rexcrazy804@users.noreply.github.com> Date: Tue, 21 Oct 2025 14:29:01 +0400 Subject: [PATCH] qdmr: 0.12.3 -> 0.13.1 Release: https://github.com/hmatuschek/qdmr/releases/tag/v0.13.1 Changes: https://github.com/hmatuschek/qdmr/compare/v0.12.3...v0.13.1 - switched to qt6 - fix build with cmake 4 - fix build of manpages --- pkgs/by-name/qd/qdmr/package.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/qd/qdmr/package.nix b/pkgs/by-name/qd/qdmr/package.nix index 0875c3b3e14c..ec24d4032f95 100644 --- a/pkgs/by-name/qd/qdmr/package.nix +++ b/pkgs/by-name/qd/qdmr/package.nix @@ -6,8 +6,9 @@ cmake, libxslt, docbook_xsl_ns, - libsForQt5, + kdePackages, libusb1, + librsvg, yaml-cpp, }: @@ -17,28 +18,30 @@ in stdenv.mkDerivation rec { pname = "qdmr"; - version = "0.12.3"; + version = "0.13.1"; src = fetchFromGitHub { owner = "hmatuschek"; repo = "qdmr"; rev = "v${version}"; - hash = "sha256-rb59zbYpIziqXWTjTApWXnkcpRiAUIqPiInEJdsYd48="; + hash = "sha256-Vz7di9VwrvtSCea3pipSCEw9pHfRv9lJn9jKzboyh6E="; }; nativeBuildInputs = [ cmake - libxslt - libsForQt5.wrapQtAppsHook + kdePackages.wrapQtAppsHook installShellFiles ]; buildInputs = [ + librsvg libusb1 - libsForQt5.qtlocation - libsForQt5.qtserialport - libsForQt5.qttools - libsForQt5.qtbase + libxslt + kdePackages.qtlocation + kdePackages.qtserialport + kdePackages.qttools + kdePackages.qtbase + kdePackages.qtpositioning yaml-cpp ]; @@ -59,6 +62,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_MAN=ON" "-DCMAKE_INSTALL_FULL_MANDIR=share/man" + "-DDOCBOOK2MAN_XSLT=docbook_man.${if isLinux then "debian" else "macports"}.xsl" "-DINSTALL_UDEV_RULES=OFF" ];