diff options
author | Peter Hoeg <peter@hoeg.com> | 2017-09-04 08:13:52 +0800 |
---|---|---|
committer | Peter Hoeg <peter@hoeg.com> | 2017-09-04 08:19:44 +0800 |
commit | c4265cd7eee41c4d6aec3cb79cd0913ece44d1e5 (patch) | |
tree | a839f00d5451556b1b0ed904dce2d0d97824248e /pkgs/data/documentation/zeal/default.nix | |
parent | c1e2a0b6f447ed6cf469b5e7fe501e4d21325570 (diff) | |
download | nixpkgs-c4265cd7eee41c4d6aec3cb79cd0913ece44d1e5.tar nixpkgs-c4265cd7eee41c4d6aec3cb79cd0913ece44d1e5.tar.gz nixpkgs-c4265cd7eee41c4d6aec3cb79cd0913ece44d1e5.tar.bz2 nixpkgs-c4265cd7eee41c4d6aec3cb79cd0913ece44d1e5.tar.lz nixpkgs-c4265cd7eee41c4d6aec3cb79cd0913ece44d1e5.tar.xz nixpkgs-c4265cd7eee41c4d6aec3cb79cd0913ece44d1e5.tar.zst nixpkgs-c4265cd7eee41c4d6aec3cb79cd0913ece44d1e5.zip |
zeal: 0.3.1 -> 0.4.0
Also switch to cmake and remove the ads that are now otherwise being loaded.
Diffstat (limited to 'pkgs/data/documentation/zeal/default.nix')
-rw-r--r-- | pkgs/data/documentation/zeal/default.nix | 39 |
1 files changed, 21 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; }; } |