From ea83efa04ea96dc3c7ee6c41cb3b389dfa3cc5cd Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 10 Mar 2026 18:08:32 +0100 Subject: [PATCH] qt6Packages.libqtdbusmock: init at 0.10.0 --- pkgs/development/libraries/libqtdbusmock/default.nix | 7 +++++-- pkgs/top-level/qt6-packages.nix | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqtdbusmock/default.nix b/pkgs/development/libraries/libqtdbusmock/default.nix index 6beeda70e863..f78387b40594 100644 --- a/pkgs/development/libraries/libqtdbusmock/default.nix +++ b/pkgs/development/libraries/libqtdbusmock/default.nix @@ -16,6 +16,9 @@ qtbase, }: +let + withQt6 = lib.strings.versionAtLeast qtbase.version "6"; +in stdenv.mkDerivation (finalAttrs: { pname = "libqtdbusmock"; version = "0.10.0"; @@ -68,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { dontWrapQtApps = true; cmakeFlags = [ - (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6")) + (lib.cmakeBool "ENABLE_QT6" withQt6) ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; @@ -95,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.unix; teams = [ lib.teams.lomiri ]; pkgConfigModules = [ - "libqtdbusmock-1" + "libqtdbusmock${lib.optionalString withQt6 "-qt6"}-1" ]; }; }) diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 1e5f1c312dde..d424a7168b75 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -75,6 +75,10 @@ makeScopeWithSplicing' { libqtpas = callPackage ../development/compilers/fpc/libqtpas.nix { }; + libqtdbusmock = callPackage ../development/libraries/libqtdbusmock { + inherit (pkgs.lomiri-qt6) cmake-extras; + }; + libqtdbustest = callPackage ../development/libraries/libqtdbustest { inherit (pkgs.lomiri-qt6) cmake-extras; };