Merge pull request #94826 from bachp/marble-qtwebengine

marble: switch from qtwebkit to qtwebengine
This commit is contained in:
Thomas Tuegel
2020-08-07 09:10:08 -05:00
committed by GitHub
+2 -2
View File
@@ -1,6 +1,6 @@
{ mkDerivation, lib { mkDerivation, lib
, extra-cmake-modules, kdoctools , extra-cmake-modules, kdoctools
, qtscript, qtsvg, qtquickcontrols, qtwebkit , qtscript, qtsvg, qtquickcontrols, qtwebengine
, krunner, shared-mime-info, kparts, knewstuff , krunner, shared-mime-info, kparts, knewstuff
, gpsd, perl , gpsd, perl
}: }:
@@ -11,7 +11,7 @@ mkDerivation {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ extra-cmake-modules kdoctools perl ]; nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];
propagatedBuildInputs = [ propagatedBuildInputs = [
qtscript qtsvg qtquickcontrols qtwebkit shared-mime-info krunner kparts qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts
knewstuff gpsd knewstuff gpsd
]; ];
preConfigure = '' preConfigure = ''