diff options
| author | Raphael Borun Das Gupta <git@raphael.dasgupta.ch> | 2022-11-19 19:17:51 +0100 |
|---|---|---|
| committer | Raphael Borun Das Gupta <git@raphael.dasgupta.ch> | 2022-11-20 13:09:55 +0100 |
| commit | 89739b5f6adb3f22656c8ba30b7e6aca64ee9477 (patch) | |
| tree | 88987336d9fc803f92eea0017af62c53aa42d9c9 | |
| parent | 1e64f5e60aa8b4a2a0cf0edb1510f086f722aeb5 (diff) | |
| download | nixpkgs-89739b5f6adb3f22656c8ba30b7e6aca64ee9477.tar nixpkgs-89739b5f6adb3f22656c8ba30b7e6aca64ee9477.tar.gz nixpkgs-89739b5f6adb3f22656c8ba30b7e6aca64ee9477.tar.bz2 nixpkgs-89739b5f6adb3f22656c8ba30b7e6aca64ee9477.tar.lz nixpkgs-89739b5f6adb3f22656c8ba30b7e6aca64ee9477.tar.xz nixpkgs-89739b5f6adb3f22656c8ba30b7e6aca64ee9477.tar.zst nixpkgs-89739b5f6adb3f22656c8ba30b7e6aca64ee9477.zip | |
kmymoney: switch from kdewebkit to qtwebengine
(to get rid of transitive dependency on qtwebkit) See PR #201028 and issue #53079
| -rw-r--r-- | pkgs/applications/office/kmymoney/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/alkimia/default.nix | 3 |
2 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 6a6ddc28449..64167b84247 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -3,7 +3,7 @@ , autoPatchelfHook , akonadi, alkimia, aqbanking, gmp, gwenhywfar, kactivities, karchive -, kcmutils, kcontacts, kdewebkit, kdiagram, kholidays, kidentitymanagement +, kcmutils, kcontacts, qtwebengine, kdiagram, kholidays, kidentitymanagement , kitemmodels, libical, libofx, qgpgme , sqlcipher @@ -23,6 +23,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-OTi4B4tzkboy4Su0I5di+uE0aDoMLsGnUQXDAso+Xj8="; }; + cmakeFlags = [ + # Remove this when upgrading to a KMyMoney release that includes + # https://invent.kde.org/office/kmymoney/-/merge_requests/118 + "-DENABLE_WEBENGINE=ON" + ]; + # Hidden dependency that wasn't included in CMakeLists.txt: NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5"; @@ -33,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ akonadi alkimia aqbanking gmp gwenhywfar kactivities karchive kcmutils - kcontacts kdewebkit kdiagram kholidays kidentitymanagement kitemmodels + kcontacts qtwebengine kdiagram kholidays kidentitymanagement kitemmodels libical libofx qgpgme sqlcipher diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix index 186c2878cde..95f87ba58f6 100644 --- a/pkgs/development/libraries/alkimia/default.nix +++ b/pkgs/development/libraries/alkimia/default.nix @@ -14,6 +14,9 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ]; + # qtwebengine is not a mandatory dependency, but it adds some features + # we might need for alkimia's dependents. See: + # https://github.com/KDE/alkimia/blob/v8.1.1/CMakeLists.txt#L124 buildInputs = [ qtbase qtwebengine kdelibs4support plasma-framework knewstuff kpackage ]; propagatedBuildInputs = [ mpir ]; |