Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zeal: unstable-2021-12-25 → unstable-2022-10-02 #202103

Merged
merged 1 commit into from
Nov 22, 2022
Merged

zeal: unstable-2021-12-25 → unstable-2022-10-02 #202103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 33 additions & 13 deletions pkgs/data/documentation/zeal/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,31 @@
{ lib, fetchFromGitHub, cmake, extra-cmake-modules, pkg-config
, qtbase, qtimageformats, qtwebengine, qtx11extras, mkDerivation
, libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms }:
{ lib
, stdenv
, fetchFromGitHub
, cmake
, extra-cmake-modules
, pkg-config
, qtbase
, qtimageformats
, qtwebengine
, qtx11extras ? null # qt5 only
, libarchive
, libXdmcp
, libpthreadstubs
, wrapQtAppsHook
, xcbutilkeysyms
}:

mkDerivation rec {
let
isQt5 = lib.versions.major qtbase.version == "5";
in stdenv.mkDerivation rec {
pname = "zeal";
version = "0.6.999";
version = "0.6.20221022";

src = fetchFromGitHub {
owner = "zealdocs";
repo = "zeal";
rev = "763edca12ccd6c67e51f10891d1ced8b2510904f";
sha256 = "sha256-1/wQXkRWvpRia8UDvvvmzHinPG8q2Tz9Uoeegej9uC8=";
rev = "7ea03e4bb9754020e902a2989f56f4bc42b85c82";
sha256 = "sha256-BozRLlws56i9P7Qtc5qPZWgJR5yhYqnLQsEdsymt5us=";
};

# we only need this if we are using a version that hasn't been released. We
Expand All @@ -22,13 +37,18 @@ mkDerivation rec {
-e 's@^project.*@project(Zeal VERSION ${version})@'
'';

nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
nativeBuildInputs = [ cmake extra-cmake-modules pkg-config wrapQtAppsHook ];

buildInputs = [
qtbase qtimageformats qtwebengine qtx11extras
libarchive
libXdmcp libpthreadstubs xcbutilkeysyms
];
buildInputs =
[
qtbase
qtimageformats
qtwebengine
libarchive
libXdmcp
libpthreadstubs
xcbutilkeysyms
] ++ lib.optionals isQt5 [ qtx11extras ];

meta = with lib; {
description = "A simple offline API documentation browser";
Expand Down
4 changes: 3 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27174,7 +27174,9 @@ with pkgs;
inherit (plasma5Packages) breeze-icons;
};

zeal = libsForQt5.callPackage ../data/documentation/zeal { };
zeal-qt5 = libsForQt5.callPackage ../data/documentation/zeal { };
zeal-qt6 = qt6Packages.callPackage ../data/documentation/zeal { };
zeal = zeal-qt5;

zilla-slab = callPackage ../data/fonts/zilla-slab { };

Expand Down