diff options
| author | Daniel Schaefer <git@danielschaefer.me> | 2019-12-22 21:43:31 +0100 |
|---|---|---|
| committer | Daniel Schaefer <git@danielschaefer.me> | 2019-12-22 21:43:31 +0100 |
| commit | 358ab81ffffc5cebbbf298c27788e77db9d0d7d7 (patch) | |
| tree | efd7472f7945a5b94afbcadabc2d1482cfb26d82 /pkgs | |
| parent | 57ad13175cd5e3be8d26baf0155a4f6305697a14 (diff) | |
| download | nixpkgs-358ab81ffffc5cebbbf298c27788e77db9d0d7d7.tar nixpkgs-358ab81ffffc5cebbbf298c27788e77db9d0d7d7.tar.gz nixpkgs-358ab81ffffc5cebbbf298c27788e77db9d0d7d7.tar.bz2 nixpkgs-358ab81ffffc5cebbbf298c27788e77db9d0d7d7.tar.lz nixpkgs-358ab81ffffc5cebbbf298c27788e77db9d0d7d7.tar.xz nixpkgs-358ab81ffffc5cebbbf298c27788e77db9d0d7d7.tar.zst nixpkgs-358ab81ffffc5cebbbf298c27788e77db9d0d7d7.zip | |
golden-cheeta: Use qtwebengine instead of qtwebkit
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/golden-cheetah/default.nix | 8 |
1 files 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 = '' |