colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #201953 from das-g/kmymoney-without-qtwebkit

Browse Source
This commit is contained in:
Sandro 2022-11-20 23:37:36 +01:00 committed by GitHub
commit af24cba835
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/office/kmymoney/default.nix
View File

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

7
pkgs/development/libraries/alkimia/default.nix
View File

@ -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,10 @@ mkDerivation rec {
nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ];
buildInputs = [ qtbase qtwebkit kdelibs4support plasma-framework knewstuff kpackage ];
# 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 ];
meta = {

1
pkgs/development/libraries/kde-frameworks/default.nix
View File

@ -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 {};

14
pkgs/development/libraries/kde-frameworks/kdewebkit.nix
View File

@ -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"
];
}