From 1e64f5e60aa8b4a2a0cf0edb1510f086f722aeb5 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Sat, 19 Nov 2022 18:49:40 +0100 Subject: [PATCH 1/3] alkimia: switch from qtwebkit to qtwebengine See PR #201028 and issue #53079 --- pkgs/development/libraries/alkimia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix index b1c040a057ec..186c2878cdeb 100644 --- a/pkgs/development/libraries/alkimia/default.nix +++ b/pkgs/development/libraries/alkimia/default.nix @@ -1,5 +1,5 @@ { mkDerivation, fetchurl, lib -, extra-cmake-modules, doxygen, graphviz, qtbase, qtwebkit, mpir +, extra-cmake-modules, doxygen, graphviz, qtbase, qtwebengine, mpir , kdelibs4support, plasma-framework, knewstuff, kpackage }: @@ -14,7 +14,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ]; - buildInputs = [ qtbase qtwebkit kdelibs4support plasma-framework knewstuff kpackage ]; + buildInputs = [ qtbase qtwebengine kdelibs4support plasma-framework knewstuff kpackage ]; propagatedBuildInputs = [ mpir ]; meta = { From 89739b5f6adb3f22656c8ba30b7e6aca64ee9477 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Sat, 19 Nov 2022 19:17:51 +0100 Subject: [PATCH 2/3] kmymoney: switch from kdewebkit to qtwebengine (to get rid of transitive dependency on qtwebkit) See PR #201028 and issue #53079 --- pkgs/applications/office/kmymoney/default.nix | 10 ++++++++-- 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 6a6ddc28449e..64167b84247c 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 186c2878cdeb..95f87ba58f6c 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 ]; From 8d9eab433a0c23f25a7bdeb9e56b6170b0eeb9fb Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Sat, 19 Nov 2022 19:56:25 +0100 Subject: [PATCH 3/3] kdewebkit: remove kdewebkit doesn't seem to be used anymore and doesn't have any nixpkgs package maintainers. I'm not sure whether the entry at https://github.com/NixOS/nixpkgs/blob/6164b7bb61395b4488919ca4bbdf918d96a7d4ab/pkgs/development/libraries/kde-frameworks/srcs.nix#L230-L237 is also part of this, but that file has a DO NOT EDIT comment, so I'm leaving it as-is. --- .../libraries/kde-frameworks/default.nix | 1 - .../libraries/kde-frameworks/kdewebkit.nix | 14 -------------- 2 files changed, 15 deletions(-) delete mode 100644 pkgs/development/libraries/kde-frameworks/kdewebkit.nix diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 2014b00b1e54..516f1ea8850f 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -159,7 +159,6 @@ let kded = callPackage ./kded.nix {}; kdesignerplugin = callPackage ./kdesignerplugin.nix {}; kdesu = callPackage ./kdesu {}; - kdewebkit = callPackage ./kdewebkit.nix {}; kemoticons = callPackage ./kemoticons.nix {}; kglobalaccel = callPackage ./kglobalaccel.nix {}; kiconthemes = callPackage ./kiconthemes {}; diff --git a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix deleted file mode 100644 index b6d548cabfcd..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ mkDerivation, extra-cmake-modules -, kconfig, kcoreaddons, kio, kparts, qtwebkit -}: - -mkDerivation { - pname = "kdewebkit"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kcoreaddons kio kparts ]; - propagatedBuildInputs = [ qtwebkit ]; - outputs = [ "out" "dev" ]; - cmakeFlags = [ - "-DBUILD_DESIGNERPLUGIN=OFF" - ]; -}