forked from ryantrinkle/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Also switch to cmake and remove the ads that are now otherwise being loaded.
- Loading branch information
Showing
2 changed files
with
35 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
}; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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> |