diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index 7bfe918030ed..4551dc211792 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -1,40 +1,44 @@
{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig
-, qtbase, qtimageformats, qtwebkit, qtx11extras, mkDerivation
+, qtbase, qtimageformats, qtwebengine, qtx11extras, mkDerivation
, libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms }:
mkDerivation rec {
pname = "zeal";
- version = "0.6.1";
+ version = "0.6.999";
src = fetchFromGitHub {
- owner = "zealdocs";
- repo = "zeal";
- rev = "v${version}";
- sha256 = "05qcjpibakv4ibhxgl5ajbkby3w7bkxsv3nfv2a0kppi1z0f8n8v";
+ owner = "zealdocs";
+ repo = "zeal";
+ rev = "1ce0e2e446232e7647c5588c1f603f1dd88e0f67";
+ sha256 = "0gj5qcm7ck8m5zfmiabay2f7wbxldmrkw8m3xi7v9i8y8hx0jkxr";
};
- # while ads can be disabled from the user settings, by default they are not so
- # we patch it out completely instead
- patches = [ ./remove_ads.patch ];
+ # we only need this if we are using a version that hasn't been released. We
+ # could also match on the "VERSION x.y.z" bit but then it would have to be
+ # updated based on whatever is the latest release, so instead just rewrite the
+ # line.
+ postPatch = ''
+ sed -i CMakeLists.txt \
+ -e 's@^project.*@project(Zeal VERSION ${version})@'
+ '';
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ];
+
buildInputs = [
- qtbase qtimageformats qtwebkit qtx11extras
+ qtbase qtimageformats qtwebengine qtx11extras
libarchive
libXdmcp libpthreadstubs xcbutilkeysyms
];
- enableParallelBuilding = true;
-
meta = with stdenv.lib; {
description = "A simple offline API documentation browser";
longDescription = ''
Zeal is a simple offline API documentation browser inspired by Dash (macOS
app), available for Linux and Windows.
'';
- homepage = "https://zealdocs.org/";
- license = licenses.gpl3;
+ homepage = "https://zealdocs.org/";
+ license = licenses.gpl3;
maintainers = with maintainers; [ skeidel peterhoeg ];
- platforms = platforms.linux;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/data/documentation/zeal/remove_ads.patch b/pkgs/data/documentation/zeal/remove_ads.patch
deleted file mode 100644
index be0cab305eb5..000000000000
--- a/pkgs/data/documentation/zeal/remove_ads.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 1b61397175b6e60f23224db463301c9057830859
-Author: Peter Hoeg
Docs for everyone
--Customize