zeal: 0.3.1 -> 0.4.0

Also switch to cmake and remove the ads that are now otherwise being loaded.

2 files changed, 35 insertions, 18 deletions

diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index cf138abee88..a1e90244f80 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -1,37 +1,40 @@
-{ stdenv, fetchFromGitHub, libarchive, pkgconfig, qtbase
-, qtimageformats, qtwebkit, qtx11extras, xcbutilkeysyms, qmake }:
+{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig
+, qtbase, qtimageformats, qtwebkit, qtx11extras
+, libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms  }:
 
 stdenv.mkDerivation rec {
-  version = "0.3.1";
   name = "zeal-${version}";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
-    owner = "zealdocs";
-    repo = "zeal";
-    rev = "v${version}";
-    sha256 = "14ld7zm15677jdlasnfa6c42kiswd4d6yg1db50xbk2yflzzwqqa";
+    owner  = "zealdocs";
+    repo   = "zeal";
+    rev    = "v${version}";
+    sha256 = "1mfcw843g4slr79bvidb5s88m7a3swr9by6srdn233b88j8mqwzl";
   };
 
-  nativeBuildInputs = [ pkgconfig qmake ];
+  # 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 ];
+
+  nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ];
   buildInputs = [
-    xcbutilkeysyms qtbase qtimageformats qtwebkit qtx11extras libarchive
+    qtbase qtimageformats qtwebkit qtx11extras
+    libarchive
+    libXdmcp libpthreadstubs xcbutilkeysyms
   ];
 
-  qmakeFlags = [ "PREFIX=/" ];
-
-  installFlags = [ "INSTALL_ROOT=$(out)" ];
-
   enableParallelBuilding = true;
 
-  meta = {
+  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 = http://zealdocs.org/;
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ skeidel ];
+    homepage    = http://zealdocs.org/;
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ skeidel ];
+    platforms   = platforms.linux;
   };
 }
diff --git a/pkgs/data/documentation/zeal/remove_ads.patch b/pkgs/data/documentation/zeal/remove_ads.patch
new file mode 100644
index 00000000000..7f163376865
--- /dev/null
+++ b/pkgs/data/documentation/zeal/remove_ads.patch
@@ -0,0 +1,14 @@
+diff --git a/src/app/resources/browser/welcome.html b/src/app/resources/browser/welcome.html
+index afe9e2a..490a0fb 100644
+--- a/src/app/resources/browser/welcome.html
++++ b/src/app/resources/browser/welcome.html
+@@ -34,9 +34,6 @@
+     <div class="hero-foot">
+       <div class="container">
+         <div class="content has-text-centered">
+-          <div id="carbon" class="box">
+-            <script async type="text/javascript" src="https://cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=zealdocsforwindowsorg" id="_carbonads_js"></script>
+-          </div>
+           <p>
+             <a class="icon" href="https://github.com/zealdocs/zeal">
+               <i class="fa fa-github"></i>