From e9eb9f97f3f363d1f73250aff9b7c0fa64c04a61 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 11 Nov 2023 17:40:32 +0300 Subject: [PATCH] kdsoap: add Qt6 support --- pkgs/development/libraries/kdsoap/default.nix | 18 ++++++++++++------ pkgs/top-level/qt6-packages.nix | 1 + 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/kdsoap/default.nix b/pkgs/development/libraries/kdsoap/default.nix index 80eb6d683207..c2f94b8e6927 100644 --- a/pkgs/development/libraries/kdsoap/default.nix +++ b/pkgs/development/libraries/kdsoap/default.nix @@ -1,11 +1,15 @@ -{ mkDerivation +{ stdenv , lib , fetchurl , cmake , qtbase +, wrapQtAppsHook }: -mkDerivation rec { +let + isQt6 = lib.versions.major qtbase.version == "6"; + cmakeName = if isQt6 then "KDSoap-qt6" else "KDSoap"; +in stdenv.mkDerivation rec { pname = "kdsoap"; version = "2.1.1"; @@ -16,15 +20,17 @@ mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ qtbase ]; + cmakeFlags = [ (lib.cmakeBool "KDSoap_QT6" isQt6) ]; + postInstall = '' - moveToOutput bin/kdwsdl2cpp "$dev" - sed -i "$out/lib/cmake/KDSoap/KDSoapTargets.cmake" \ + moveToOutput bin/kdwsdl2cpp* "$dev" + sed -i "$out/lib/cmake/${cmakeName}/KDSoapTargets.cmake" \ -e "/^ INTERFACE_INCLUDE_DIRECTORIES/ c INTERFACE_INCLUDE_DIRECTORIES \"$dev/include\"" - sed -i "$out/lib/cmake/KDSoap/KDSoapTargets-release.cmake" \ + sed -i "$out/lib/cmake/${cmakeName}/KDSoapTargets-release.cmake" \ -e "s@$out/bin@$dev/bin@" ''; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 1b6e1ce4c1c7..dd689f214031 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -29,6 +29,7 @@ makeScopeWithSplicing' { inherit stdenv; # LIBRARIES + kdsoap = callPackage ../development/libraries/kdsoap { }; qt6ct = callPackage ../tools/misc/qt6ct { };