Skip to content

Commit

Permalink
kmymoney: switch from kdewebkit to qtwebengine
Browse files Browse the repository at this point in the history
(to get rid of transitive dependency on qtwebkit)
See PR NixOS#201028 and issue NixOS#53079
  • Loading branch information
das-g committed Nov 20, 2022
1 parent 1e64f5e commit 89739b5
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
10 changes: 8 additions & 2 deletions pkgs/applications/office/kmymoney/default.nix
Expand Up @@ -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
Expand All @@ -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";

Expand All @@ -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

Expand Down
3 changes: 3 additions & 0 deletions pkgs/development/libraries/alkimia/default.nix
Expand Up @@ -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 ];

Expand Down

0 comments on commit 89739b5

Please sign in to comment.