diff options
| author | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2022-11-20 14:15:47 -0600 |
|---|---|---|
| committer | Peter Hoeg <peter@hoeg.com> | 2022-11-22 09:12:33 +0800 |
| commit | 3be2a76832fa540b32cefd8bf8e9095037f97391 (patch) | |
| tree | b294b86cde4e6237373fd9175de2c014d733c764 /pkgs/data | |
| parent | 4c5f7afb5f25d1404e79c87009abb5d6fffcf0cd (diff) | |
zeal: unstable-2021-12-25 → unstable-2022-10-02
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/documentation/zeal/default.nix | 46 |
1 files changed, 33 insertions, 13 deletions
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index de3d7638eb9bf..3a8b7122c7ff2 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -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 @@ -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"; |