From 358ab81ffffc5cebbbf298c27788e77db9d0d7d7 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Sun, 22 Dec 2019 21:43:31 +0100 Subject: [PATCH] golden-cheeta: Use qtwebengine instead of qtwebkit --- pkgs/applications/misc/golden-cheetah/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 6fd5b1530c2..dde1c32e805 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, mkDerivation -, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools +, qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools , qtconnectivity, qtcharts, libusb , yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper }: @@ -26,7 +26,7 @@ in mkDerivation rec { }; buildInputs = [ - qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools zlib + qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib qtconnectivity qtcharts libusb ]; nativeBuildInputs = [ flex makeWrapper qmake yacc ]; @@ -43,6 +43,10 @@ in mkDerivation rec { echo 'LIBUSB_INCLUDE = ${libusb.dev}/include' >> src/gcconfig.pri echo 'LIBUSB_LIBS = -L${libusb}/lib -lusb' >> src/gcconfig.pri sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local + + # Use qtwebengine instead of qtwebkit + substituteInPlace src/gcconfig.pri \ + --replace "#DEFINES += NOWEBKIT" "DEFINES += NOWEBKIT" ''; installPhase = ''